diff --git a/editions/tw5.com/tiddlers/tags/command.tid b/editions/tw5.com/tiddlers/tags/command.tid
@@ -1,8 +1,9 @@
 color: #8bbec7
-created: 201308241531
+created: 20130824153100000
 creator: JeremyRuston
-modified: 201308241531
+modified: 20131129094148475
 modifier: JeremyRuston
 title: command
+type: text/vnd.tiddlywiki
 
-When run under node.js, TiddlyWiki supports a [[command line interface|TiddlyWiki5 Node Edition]] with these built-in commands.
+When run under Node.js, TiddlyWiki supports a [[command line interface|TiddlyWiki5 on Node.js]] with these built-in commands.
diff --git a/editions/tw5.com/tiddlers/tags/edition.tid b/editions/tw5.com/tiddlers/tags/edition.tid
diff --git a/editions/tw5.com/tiddlers/talkytalky/TalkyTalky.tid b/editions/tw5.com/tiddlers/talkytalky/TalkyTalky.tid
@@ -13,7 +13,7 @@ title: TalkyTalky
 !! @~TiddlyWiki & @Jermolene
 @@
 
-TiddlyWiki5 is a JavaScript wiki that can run entirely in the browser, or under ''node.js''. Internally, it is a representation transformation engine. It parses WikiText and renders it as text, or straight to the DOM with selective refresh to reflect subsequent changes. WikiText is used to render the user interface as well as the content of tiddlers. Once you know how to edit a tiddler you know how to customise TiddlyWiki, with no limits - it's only JavaScript.
+TiddlyWiki5 is a JavaScript wiki that can run entirely in the browser, or under ''Node.js''. Internally, it is a representation transformation engine. It parses WikiText and renders it as text, or straight to the DOM with selective refresh to reflect subsequent changes. WikiText is used to render the user interface as well as the content of tiddlers. Once you know how to edit a tiddler you know how to customise TiddlyWiki, with no limits - it's only JavaScript.
 
 Why is TiddlyWiki different? It frees you from the monopoly platforms of the web: store stuff in TW5 and you can pretty much guarantee you'll still have it in 100 years. Freedom, into the far future.
 
@@ -28,7 +28,7 @@ Store your tiddlers in a single HTML file along with the JS
 # Create tiddlers, show links, missing, orphans, tags, tagging, references
 # Use missing tiddlers to find a typo
 # Show shadow tiddlers and system tiddlers
-# Show stylesheet handling - [[$:/themes/tiddlywiki/snowwhite/base]]
+# Show stylesheet handling - [[$:/themes/tiddlywiki/vanilla/base]]
 # Drag an image from the file system
 # Use the image in a tiddler
 # Edit the image
@@ -45,7 +45,7 @@ Store your tiddlers in a single HTML file along with the JS
 # Drag in the task tiddlers
 # Drag in TaskManagementExample, show source
 
-!!! node.js Edition
+!!! Node.js Edition
 
 Store your tiddlers in separate files in a chain of linked directories.
 

diff --git a/editions/tw5.com/tiddlers/tips/GoogleChromeTips.tid b/editions/tw5.com/tiddlers/tips/GoogleChromeTips.tid
@@ -1,11 +1,12 @@
-created: 201308251604
+created: 20130825160400000
 creator: JeremyRuston
-modified: 201308251604
+modified: 20131129100426443
 modifier: JeremyRuston
 tags: tips
 title: GoogleChromeTips
+type: text/vnd.tiddlywiki
 
-Some suggestions for streamlining [[using TiddlyWiki as a single file|How to use TiddlyWiki5 as a standalone HTML file]] with GoogleChrome.
+Some suggestions for streamlining working with GoogleChrome.
 
 ! Download Prompts
 

diff --git a/editions/tw5.com/tiddlers/tips/TitlesPolicy.tid b/editions/tw5.com/tiddlers/tips/TitlesPolicy.tid
@@ -1,9 +1,10 @@
-created: 201308251033
+created: 20130825103300000
 creator: JeremyRuston
-modified: 201308251418
+modified: 20131129100159005
 modifier: JeremyRuston
 tags: tips
 title: TitlesPolicy
+type: text/vnd.tiddlywiki
 
 As the structures within your TiddlyWiki documents get more complex it can be hard to keep the titles of tiddlers consistent. For example, should terms be defined in the plural or the singular? Camel case or separate words?
 
@@ -16,4 +17,4 @@ Recording a formal titling policy can help to reduce confusion. For example, the
 * Use separate words for titles that are full phrases or sentences, such as FAQs, howtos or tasks
 ** e.g. [[How to build a TiddlyWiki5 from individual tiddlers]]
 * Where TiddlyWiki or TiddlyWiki5 is used as a qualifier at the start of the title, always use separate words
-** e.g. [[TiddlyWiki5 Editions]]
+** e.g. [[Saving with TiddlyFox]]
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
@@ -1,9 +1,13 @@
 {
 	"plugins": [
-		"tiddlywiki/fullscreen"
+		"tiddlywiki/fullscreen",
+		"tiddlywiki/googleanalytics",
+		"tiddlywiki/github-fork-ribbon"
 	],
 	"themes": [
+		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
+		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/stickytitles",
 		"tiddlywiki/centralised",

diff --git a/editions/tw5tiddlyweb/tiddlywiki.info b/editions/tw5tiddlyweb/tiddlywiki.info
@@ -4,6 +4,7 @@
 		"tiddlywiki/tiddlyweb"
 	],
 	"themes": [
+		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	]
 }
diff --git a/ginsu.cmd b/ginsu.cmd
@@ -0,0 +1,15 @@
+@echo off
+
+rem Split the tiddlers out of a TiddlyWiki file
+
+setlocal enableextensions
+mkdir tmp\ginsu
+setlocal disableextensions
+
+node .\tiddlywiki.js ^
+	.\editions\empty ^
+	--verbose ^
+	--load %1 ^
+	--rendertiddler $:/core/templates/split-recipe tmp\ginsu\split.recipe text/plain ^
+	--rendertiddlers [!is[system]] $:/core/templates/tid-tiddler tmp\ginsu text/plain .tid ^
+	|| exit 1
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md
@@ -116,3 +116,6 @@ Tobias Beer, @tobibeer, 2013/09/21
 Nate Cain, @natecain, 2013/09/30
 
 Bob Robison, @grayeul, 2013/11/11
+
+Adrian Sampaleanu, @asampal, 2013/11/17
+
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tiddlywiki",
   "preferGlobal": "true",
-  "version": "5.0.0-alpha.15",
+  "version": "5.0.0-alpha.16",
   "author": "Jeremy Ruston <jeremy@jermolene.com>",
   "description": "a non-linear personal web notebook",
   "contributors": [

diff --git a/plugins/tiddlywiki/github-fork-ribbon/plugin.info b/plugins/tiddlywiki/github-fork-ribbon/plugin.info
@@ -0,0 +1,6 @@
+{
+	"title": "$:/plugins/tiddlywiki/github-fork-ribbon",
+	"description": "Codemirror plugin",
+	"author": "Simon Whitaker, adapted for TiddlyWiki by JeremyRuston",
+	"coreVersion": ">=5.0.0"
+}
diff --git a/plugins/tiddlywiki/github-fork-ribbon/readme.tid b/plugins/tiddlywiki/github-fork-ribbon/readme.tid
@@ -0,0 +1,27 @@
+title: $:/plugins/tiddlywiki/github-fork-ribbon/readme
+
+This stylesheet is adapted from work by Simon Whitaker:
+
+https://github.com/simonwhitaker/github-fork-ribbon-css/
+
+
+<!-- TOP RIGHT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- TOP RIGHT RIBBON: END COPYING HERE -->
+
+<!-- TOP LEFT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper left"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- TOP LEFT RIBBON: END COPYING HERE -->
+
+
+<!-- BOTTOM RIGHT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper right-bottom"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- BOTTOM RIGHT RIBBON: END COPYING HERE -->
+
+<!-- BOTTOM LEFT RIBBON: START COPYING HERE -->
+<div class="github-fork-ribbon-wrapper left-bottom"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
+</div>
+<!-- BOTTOM LEFT RIBBON: END COPYING HERE -->
diff --git a/plugins/tiddlywiki/github-fork-ribbon/styles.tid b/plugins/tiddlywiki/github-fork-ribbon/styles.tid
@@ -0,0 +1,138 @@
+title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
+tags: [[$:/tags/stylesheet]]
+
+/* Left will inherit from right (so we don't need to duplicate code */
+.github-fork-ribbon {
+  /* The right and left lasses determine the side we attach our banner to */
+  position: absolute;
+
+  /* Add a bit of padding to give some substance outside the "stitching" */
+  padding: 2px 0;
+
+  /* Set the base colour */
+  background-color: #a00;
+
+  /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
+  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.00)), to(rgba(0, 0, 0, 0.15)));
+  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#000000', EndColorStr='#000000');
+
+  /* Add a drop shadow */
+  -webkit-box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
+
+  z-index: 999;
+  pointer-events: auto;
+}
+
+.github-fork-ribbon a, .github-fork-ribbon a.tw-tiddlylink,
+.github-fork-ribbon a:hover, .github-fork-ribbon a.tw-tiddlylink:hover  {
+  /* Set the font */
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: 700;
+  color: white;
+
+  /* Set the text properties */
+  text-decoration: none;
+  text-shadow: 0 -1px rgba(0,0,0,0.5);
+  text-align: center;
+
+  /* Set the geometry. If you fiddle with these you'll also need to tweak the top and right values in #github-fork-ribbon. */
+  width: 200px;
+  line-height: 20px;
+
+  /* Set the layout properties */
+  display: inline-block;
+  padding: 2px 0;
+
+  /* Add "stitching" effect */
+  border-width: 1px 0;
+  border-style: dotted;
+  border-color: rgba(255,255,255,0.7);
+}
+
+.github-fork-ribbon-wrapper {
+  width: 150px;
+  height: 150px;
+  position: absolute;
+  overflow: hidden;
+  top: 0;
+  z-index: 999;
+  pointer-events: none;
+}
+
+.github-fork-ribbon-wrapper.fixed {
+  position: fixed;
+}
+
+.github-fork-ribbon-wrapper.left {
+  left: 0;
+}
+
+.github-fork-ribbon-wrapper.right {
+  right: 0;
+}
+
+.github-fork-ribbon-wrapper.left-bottom {
+  position: fixed;
+  top: inherit;
+  bottom: 0;
+  left: 0;
+}
+
+.github-fork-ribbon-wrapper.right-bottom {
+  position: fixed;
+  top: inherit;
+  bottom: 0;
+  right: 0;
+}
+
+.github-fork-ribbon-wrapper.right .github-fork-ribbon {
+  top: 42px;
+  right: -43px;
+
+  /* Rotate the banner 45 degrees */
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.github-fork-ribbon-wrapper.left .github-fork-ribbon {
+  top: 42px;
+  left: -43px;
+
+  /* Rotate the banner -45 degrees */
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
+
+
+.github-fork-ribbon-wrapper.left-bottom .github-fork-ribbon {
+  top: 80px;
+  left: -43px;
+
+  /* Rotate the banner -45 degrees */
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.github-fork-ribbon-wrapper.right-bottom .github-fork-ribbon {
+  top: 80px;
+  right: -43px;
+
+  /* Rotate the banner -45 degrees */
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
diff --git a/plugins/tiddlywiki/googleanalytics/googleanalytics.js b/plugins/tiddlywiki/googleanalytics/googleanalytics.js
@@ -0,0 +1,32 @@
+/*\
+title: $:/plugins/tiddlywiki/googleanalytics/googleanalytics.js
+type: application/javascript
+module-type: startup
+
+Runs Google Analytics with the account number in the tiddler `$:/GoogleAnalyticsAccount` and the domain name in `$:/GoogleAnalyticsDomain`
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var GOOGLE_ANALYTICS_ACCOUNT = "$:/GoogleAnalyticsAccount",
+	GOOGLE_ANALYTICS_DOMAIN = "$:/GoogleAnalyticsDomain";
+
+exports.startup = function() {
+	if($tw.browser) {
+		window._gaq = window._gaq || [];
+		_gaq.push(["_setAccount", $tw.wiki.getTiddlerText(GOOGLE_ANALYTICS_ACCOUNT)]);
+		_gaq.push(["_setDomainName", $tw.wiki.getTiddlerText(GOOGLE_ANALYTICS_DOMAIN)]);
+		_gaq.push(["_trackPageview"]);
+		var ga = document.createElement("script");
+		ga.type = "text/javascript";
+		ga.async = true;
+		ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
+		document.body.appendChild(ga);
+	}
+};
+
+})();
diff --git a/plugins/tiddlywiki/googleanalytics/plugin.info b/plugins/tiddlywiki/googleanalytics/plugin.info
@@ -0,0 +1,6 @@
+{
+	"title": "$:/plugins/tiddlywiki/googleanalytics",
+	"description": "Google Analytics plugin for TiddlyWiki5",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0"
+}
diff --git a/readme.md b/readme.md
diff --git a/serve.cmd b/serve.cmd
@@ -0,0 +1,11 @@
+@echo off
+
+rem serve TiddlyWiki5 over HTTP
+
+rem Optional parameter is the username for signing edits
+
+node .\tiddlywiki.js ^
+	editions\clientserver ^
+	--verbose ^
+	--server 8080 $:/core/save/all text/plain text/html %1 %2^
+	|| exit 1
diff --git a/serve.sh b/serve.sh
@@ -7,5 +7,5 @@
 node ./tiddlywiki.js \
 	editions/clientserver \
 	--verbose \
-	--server 8080 $:/core/templates/tiddlywiki5.template.html text/plain text/html $1\
+	--server 8080 $:/core/save/all text/plain text/html $1 $2\
 	|| exit 1
diff --git a/test.cmd b/test.cmd
@@ -0,0 +1,24 @@
+@echo off
+
+rem test TiddlyWiki5 for five.tiddlywiki.com
+
+rem Set up the build output directory
+
+if "x%TW5_BUILD_OUTPUT%" == "x" (
+	set TW5_BUILD_OUTPUT=..\jermolene.github.com
+)
+
+if not exist %TW5_BUILD_OUTPUT%\nul (
+	echo A valid TW5_BUILD_OUTPUT environment variable must be set
+	exit 1
+)
+
+echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT%
+
+rem Run the test edition to run the node.js tests and to generate test.html for tests in the browser
+
+node .\tiddlywiki.js ^
+	.\editions\test ^
+	--verbose ^
+	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\test.html text/plain ^
+	|| exit 1
diff --git a/test.sh b/test.sh
@@ -20,5 +20,5 @@ echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]"
 node ./tiddlywiki.js \
 	./editions/test \
 	--verbose \
-	--rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/test.html text/plain \
+	--rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/test.html text/plain \
 	|| exit 1
diff --git a/themes/tiddlywiki/nighttime/base.tid b/themes/tiddlywiki/nighttime/base.tid
@@ -0,0 +1,8 @@
+title: $:/themes/tiddlywiki/nighttime/base
+tags: [[$:/tags/stylesheet]]
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
+
+html body.tw-body {
+	background-color: #5C5D8E;
+}
diff --git a/themes/tiddlywiki/nighttime/plugin.info b/themes/tiddlywiki/nighttime/plugin.info
@@ -0,0 +1,9 @@
+{
+	"title": "$:/themes/tiddlywiki/nighttime",
+	"name": "Night-time",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0",
+	"plugin-type": "theme",
+	"description": "A darker theme",
+	"dependents": ["$:/themes/tiddlywiki/vanilla"]
+}
diff --git a/themes/tiddlywiki/snowwhite/ThemeTweaks.tid b/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
diff --git a/themes/tiddlywiki/snowwhite/colourmappings.tid b/themes/tiddlywiki/snowwhite/colourmappings.tid
diff --git a/themes/tiddlywiki/snowwhite/plugin.info b/themes/tiddlywiki/snowwhite/plugin.info
@@ -4,5 +4,6 @@
 	"author": "JeremyRuston",
 	"core-version": ">=5.0.0",
 	"plugin-type": "theme",
-	"description": "A plain simple theme that emphasises individual tiddlers"
+	"description": "A clean theme that emphasises individual tiddlers",
+	"dependents": ["$:/themes/tiddlywiki/vanilla"]
 }
diff --git a/themes/tiddlywiki/starlight/styles.tid b/themes/tiddlywiki/starlight/styles.tid
@@ -72,27 +72,27 @@ svg.tw-image-save-button {
   fill: #0e90d2; /* Light blue */
 }
 
-svg.tw-image-info-button {
+.tw-tiddler-controls button svg.tw-image-info-button {
   fill: #0e90d2; /* Light blue */
 }
 
-svg.tw-image-edit-button {
+.tw-tiddler-controls button svg.tw-image-edit-button {
   fill: rgb(243, 123, 29); /* Orange */
 }
 
-svg.tw-image-close-button {
+.tw-tiddler-controls button svg.tw-image-close-button {
   fill: #dd514c; /* Red */
 }
 
-svg.tw-image-delete-button {
+.tw-tiddler-controls button svg.tw-image-delete-button {
   fill: #dd514c; /* Red */
 }
 
-svg.tw-image-cancel-button {
+.tw-tiddler-controls button svg.tw-image-cancel-button {
   fill: rgb(243, 123, 29); /* Orange */
 }
 
-svg.tw-image-done-button {
+.tw-tiddler-controls button svg.tw-image-done-button {
   fill: #5eb95e; /* Green */
 }
 
diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
@@ -0,0 +1,40 @@
+title: $:/themes/tiddlywiki/vanilla/themetweaks
+tags: $:/tags/ControlPanel
+caption: Theme Tweaks
+
+You can tweak certain aspects of the ''Vanilla'' theme.
+
+//Currently, you need to toggle to a different theme and back (or save and restart TiddlyWiki) before these changes take effect. Also take care to preserve any backticks (&#96;) in the settings//
+
+! Colours
+
+* Primary colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="primary" default="" tag="input" type="color"/>
+* Background colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="background" default="" tag="input" type="color"/>
+* Foreground colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="foreground" default="" tag="input" type="color"/>
+* Page background colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="pagebackground" default="" tag="input" type="color"/>
+* Medium contrast color: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="medium" default="" tag="input" type="color"/>
+
+! Colour mappings
+
+* Tiddler background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="tiddlerbackground" default="" tag="input"/>
+* Tiddler foreground colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="foreground" default="" tag="input"/>
+* Page background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="pagebackground" default="" tag="input"/>
+* Link background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="linkbackground" default="" tag="input"/>
+* Link foreground colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="linkforeground" default="" tag="input"/>
+* Dropdown background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="dropdownbackground" default="" tag="input"/>
+* Dropdown border colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="dropdownborder" default="" tag="input"/>
+
+! Settings
+
+* Font family: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings" index="fontfamily" default="" tag="input"/>
+
+! Sizes
+
+* Font size: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="fontsize" default="" tag="input"/>
+* Line height: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="lineheight" default="" tag="input"/>
+* Story left position //(the distance between the left of the screen and the left margin of the story river or tiddler area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="storyleft" default="" tag="input"/>
+* Story top position //(the distance between the top of the screen ad the top margin of the story river or tiddler area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="storytop" default="" tag="input"/>
+* Story right //(the distance between the left side of the screen and the left margin of the sidebar area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="storyright" default="" tag="input"/>
+* Story width //(the width of the story river or tiddler area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="storywidth" default="" tag="input"/>
+* Tiddler width //(the width of individual tiddlers -- used for zoomin storyview)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics" index="tiddlerwidth" default="" tag="input"/>
+
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
diff --git a/themes/tiddlywiki/vanilla/colourmappings.tid b/themes/tiddlywiki/vanilla/colourmappings.tid
@@ -0,0 +1,10 @@
+title: $:/themes/tiddlywiki/vanilla/colourmappings
+type: application/x-tiddler-dictionary
+
+tiddlerbackground: {{$:/themes/tiddlywiki/vanilla/colours##background}}
+foreground: {{$:/themes/tiddlywiki/vanilla/colours##foreground}}
+pagebackground: {{$:/themes/tiddlywiki/vanilla/colours##pagebackground}}
+linkbackground: {{$:/themes/tiddlywiki/vanilla/colours##background}}
+linkforeground: {{$:/themes/tiddlywiki/vanilla/colours##primary}}
+dropdownbackground: {{$:/themes/tiddlywiki/vanilla/colours##background}}
+dropdownborder: {{$:/themes/tiddlywiki/vanilla/colours##medium}}
diff --git a/themes/tiddlywiki/snowwhite/colours.tid → themes/tiddlywiki/vanilla/colours.tid b/themes/tiddlywiki/snowwhite/colours.tid → themes/tiddlywiki/vanilla/colours.tid
@@ -1,4 +1,4 @@
-title: $:/themes/tiddlywiki/snowwhite/colours
+title: $:/themes/tiddlywiki/vanilla/colours
 type: application/x-tiddler-dictionary
 
 primary: `#007dff`

diff --git a/themes/tiddlywiki/snowwhite/metrics.tid → themes/tiddlywiki/vanilla/metrics.tid b/themes/tiddlywiki/snowwhite/metrics.tid → themes/tiddlywiki/vanilla/metrics.tid
@@ -1,4 +1,4 @@
-title: $:/themes/tiddlywiki/snowwhite/metrics
+title: $:/themes/tiddlywiki/vanilla/metrics
 type: application/x-tiddler-dictionary
 
 fontsize: `14px`

diff --git a/themes/tiddlywiki/vanilla/plugin.info b/themes/tiddlywiki/vanilla/plugin.info
@@ -0,0 +1,8 @@
+{
+	"title": "$:/themes/tiddlywiki/vanilla",
+	"name": "Vanilla",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0",
+	"plugin-type": "theme",
+	"description": "A basic default theme"
+}
diff --git a/themes/tiddlywiki/snowwhite/reset.tid → themes/tiddlywiki/vanilla/reset.tid b/themes/tiddlywiki/snowwhite/reset.tid → themes/tiddlywiki/vanilla/reset.tid
@@ -1,4 +1,4 @@
-title: $:/themes/tiddlywiki/snowwhite/reset
+title: $:/themes/tiddlywiki/vanilla/reset
 type: text/plain
 
 /*! normalize.css v2.1.0 | MIT License | git.io/normalize */

diff --git a/themes/tiddlywiki/snowwhite/settings.tid → themes/tiddlywiki/vanilla/settings.tid b/themes/tiddlywiki/snowwhite/settings.tid → themes/tiddlywiki/vanilla/settings.tid
@@ -1,4 +1,4 @@
-title: $:/themes/tiddlywiki/snowwhite/settings
+title: $:/themes/tiddlywiki/vanilla/settings
 type: application/x-tiddler-dictionary
 
 fontfamily: `"Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif`
diff --git a/verbump.cmd b/verbump.cmd
@@ -0,0 +1,16 @@
+@echo off
+
+rem Bump to a new version number
+
+if "x%1" == "x" (
+	echo Missing version (eg '5.0.0-alpha.99'^)
+	exit 1
+)
+
+rem Set the new version number (will also commit and tag the release)
+
+npm version %1 -m "Version update" || exit 1
+
+rem Make sure our tags are pushed to the origin server
+
+git push origin --tags || exit 1
diff --git a/wbld.cmd b/wbld.cmd
@@ -0,0 +1,29 @@
+@echo off
+
+rem build the TiddlyWeb edition of TiddlyWiki5 and upload it to TiddlySpace. Requires the TiddlySpace credentials
+rem of a member of the tw5tiddlyweb space
+
+rem usage:
+rem .\wbld.cmd <tiddlyspace username> <tiddlyspace password>
+
+rem Create the tmp directory if needed
+
+mkdir tmp
+
+rem Open the tw5tiddlyweb edition in TW5 and save the template for the main HTML file
+
+node .\tiddlywiki.js ^
+	editions\tw5tiddlyweb ^
+	--verbose ^
+	--rendertiddler $:/core/templates/tiddlywiki5.template.html tmp\tiddlyweb.html text/plain ^
+	|| exit 1
+
+rem Prepend the type information that TiddlyWeb needs to turn the .html file into a .tid file
+
+echo "type: text/html" > tmp\tiddlerforupload.txt
+echo "" >> tmp\tiddlerforupload.txt
+type tmp\tiddlyweb.html >> tmp\tiddlerforupload.txt
+
+rem Upload the tiddler file
+
+curl -u %1:%2 -X PUT -H "content-type: text/plain" http://tw5tiddlyweb.tiddlyspace.com/bags/tw5tiddlyweb_public/tiddlers/tw5 --data-binary @tmp/tiddlerforupload.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -116,3 +116,6 @@ Tobias Beer, @tobibeer, 2013/09/21
		Nate Cain, @natecain, 2013/09/30

		Bob Robison, @grayeul, 2013/11/11

		Adrian Sampaleanu, @asampal, 2013/11/17