From 84650b9a54fabf63d19ed3a816894166f3977929 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sun, 18 Nov 2012 15:22:13 +0000
Subject: [PATCH] Swap over to the new mime type conventions

Discussed in
https://groups.google.com/forum/#!topic/tiddlywikidev/re8xfLqZNCE
---
 core/boot.js                                                | 2 +-
 core/messages/Download.tid                                  | 2 +-
 core/messages/EnterEditMode.tid                             | 2 +-
 core/messages/SaveInstructions.tid                          | 2 +-
 core/modules/macros/edit/edit.js                            | 2 +-
 core/modules/macros/edit/editors/texteditor.js              | 2 +-
 core/modules/macros/list/list.js                            | 2 +-
 core/modules/macros/tiddler.js                              | 2 +-
 core/modules/macros/view/viewers/wikified.js                | 2 +-
 core/modules/parsers/javascriptparser/javascriptparser.js   | 4 ++--
 core/modules/parsers/tiddlytextparser.js                    | 4 ++--
 core/modules/parsers/wikitextparser/wikitextparser.js       | 6 +++---
 core/modules/utils/dom/modal.js                             | 4 ++--
 core/modules/wiki.js                                        | 4 ++--
 core/templates/StaticContent.tid                            | 2 +-
 core/templates/static.template.html.tid                     | 2 +-
 core/templates/tiddlywiki5.encrypted.template.html.tid      | 2 +-
 core/templates/tiddlywiki5.template.html.tid                | 2 +-
 core/wiki/title.tid                                         | 2 +-
 editions/tw2/wiki/tiddlywiki2.template.html.tid             | 2 +-
 editions/tw5.com/tiddlers/HelloThere.tid                    | 2 +-
 editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid        | 2 +-
 editions/tw5.com/tiddlers/concepts/WikiText.tid             | 2 +-
 editions/tw5.com/tiddlers/mechanisms/ParsingMechanism.tid   | 4 ++--
 editions/tw5dropbox/appwiki/wiki/index.template.html.tid    | 2 +-
 editions/tw5dropbox/appwiki/wiki/styles.template.css.tid    | 2 +-
 editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid | 2 +-
 editions/tw5dropbox/dummycontent/HelloThere.tid             | 2 +-
 editions/tw5dropbox/mainwiki/wiki/index.template.html.tid   | 2 +-
 plugins/tiddlywiki/dropbox/dropbox.js                       | 4 ++--
 plugins/tiddlywiki/tiddlyweb/tiddlyweb.js                   | 2 +-
 plugins/tiddlywiki/tw2parser/wikitextparser.js              | 2 +-
 readme.md                                                   | 2 +-
 tests/wikitests/EighthTiddler.tid                           | 2 +-
 tests/wikitests/Fifth Tiddler.tid                           | 2 +-
 tests/wikitests/FirstTiddler.tid                            | 2 +-
 tests/wikitests/Fourth Tiddler.tid                          | 2 +-
 tests/wikitests/SecondTiddler.tid                           | 2 +-
 tests/wikitests/SeventhTiddler.tid                          | 2 +-
 tests/wikitests/SixthTiddler.tid                            | 2 +-
 tests/wikitests/ThirdTiddler.tid                            | 2 +-
 41 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/core/boot.js b/core/boot.js
index 5be7bce53..e8672c785 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -82,7 +82,7 @@ $tw.config.fileExtensionInfo = {
 
 // Content type mappings
 $tw.config.contentTypeInfo = {
-	"text/x-tiddlywiki": {encoding: "utf8", extension: ".tid"},
+	"text/vnd.tiddlywiki": {encoding: "utf8", extension: ".tid"},
 	"application/x-tiddler": {encoding: "utf8", extension: ".tid"},
 	"application/x-tiddler-html-div": {encoding: "utf8", extension: ".tiddler"},
 	"application/x-tiddlywiki-recipe": {encoding: "utf8", extension: ".recipe"},
diff --git a/core/messages/Download.tid b/core/messages/Download.tid
index 07f4f2fca..6435d34bf 100644
--- a/core/messages/Download.tid
+++ b/core/messages/Download.tid
@@ -1,5 +1,5 @@
 title: $:/messages/Download
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 subtitle: Download changes
 footer: <<button close class:"btn btn-primary"><Close>>
 help: http://five.tiddlywiki.com/#help:DownloadingChanges
diff --git a/core/messages/EnterEditMode.tid b/core/messages/EnterEditMode.tid
index 5d9655c10..284e3a6fc 100644
--- a/core/messages/EnterEditMode.tid
+++ b/core/messages/EnterEditMode.tid
@@ -1,5 +1,5 @@
 title: $:/messages/EnterEditMode
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 subtitle: Editing this wiki
 footer: <<button close class:"btn btn-primary"><Close>>
 help: http://five.tiddlywiki.com/#help:EditMode
diff --git a/core/messages/SaveInstructions.tid b/core/messages/SaveInstructions.tid
index a642f72ca..7111bc8c7 100644
--- a/core/messages/SaveInstructions.tid
+++ b/core/messages/SaveInstructions.tid
@@ -1,5 +1,5 @@
 title: $:/messages/SaveInstructions
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 subtitle: Save your work
 footer: <<button close class:"btn btn-primary"><Close>>
 help: http://five.tiddlywiki.com/#help:SavingChanges
diff --git a/core/modules/macros/edit/edit.js b/core/modules/macros/edit/edit.js
index feb15924e..467fdd5c2 100644
--- a/core/modules/macros/edit/edit.js
+++ b/core/modules/macros/edit/edit.js
@@ -53,7 +53,7 @@ exports.executeMacro = function() {
 		Editor = this.wiki.macros.edit.editors[tiddler.fields.type];
 	}
 	if(!Editor) {
-		Editor = this.wiki.macros.edit.editors["text/x-tiddlywiki"];
+		Editor = this.wiki.macros.edit.editors["text/vnd.tiddlywiki"];
 	}
 	this.editor = new Editor(this);
 	// Call the editor to generate the child nodes
diff --git a/core/modules/macros/edit/editors/texteditor.js b/core/modules/macros/edit/editors/texteditor.js
index 9add9e411..5166c684d 100644
--- a/core/modules/macros/edit/editors/texteditor.js
+++ b/core/modules/macros/edit/editors/texteditor.js
@@ -145,7 +145,7 @@ TextEditor.prototype.refreshInDom = function() {
 	this.fixHeight();
 };
 
-exports["text/x-tiddlywiki"] = TextEditor;
+exports["text/vnd.tiddlywiki"] = TextEditor;
 exports["text/plain"] = TextEditor;
 
 })();
diff --git a/core/modules/macros/list/list.js b/core/modules/macros/list/list.js
index e6164cb55..2b734ff1b 100644
--- a/core/modules/macros/list/list.js
+++ b/core/modules/macros/list/list.js
@@ -102,7 +102,7 @@ exports.getTiddlerList = function() {
 Create and execute the nodes representing the empty message
 */
 exports.getEmptyMessage = function() {
-	var nodes = this.wiki.parseText("text/x-tiddlywiki",this.params.emptyMessage).tree;
+	var nodes = this.wiki.parseText("text/vnd.tiddlywiki",this.params.emptyMessage).tree;
 	for(var c=0; c<nodes.length; c++) {
 		nodes[c].execute(this.parents,this.tiddlerTitle);
 	}
diff --git a/core/modules/macros/tiddler.js b/core/modules/macros/tiddler.js
index 6aaa92037..60b5b4904 100644
--- a/core/modules/macros/tiddler.js
+++ b/core/modules/macros/tiddler.js
@@ -99,7 +99,7 @@ exports.executeMacro = function() {
 	}
 	// Get the render tree for the template
 	if(this.hasParameter("templateText")) {
-		renderTemplateTree = this.wiki.parseText("text/x-tiddlywiki",this.params.templateText).tree;
+		renderTemplateTree = this.wiki.parseText("text/vnd.tiddlywiki",this.params.templateText).tree;
 	} else {
 		if(this.hasParameter("template")) {
 			renderTemplateTitle = this.params.template;
diff --git a/core/modules/macros/view/viewers/wikified.js b/core/modules/macros/view/viewers/wikified.js
index b728e2baf..f94db929e 100644
--- a/core/modules/macros/view/viewers/wikified.js
+++ b/core/modules/macros/view/viewers/wikified.js
@@ -32,7 +32,7 @@ WikifiedViewer.prototype.render = function() {
 		parents = parents.slice(0);
 		parents.push(this.tiddler.fields.title);
 	} else {
-		children = this.viewMacro.wiki.parseText("text/x-tiddlywiki",this.value).tree;
+		children = this.viewMacro.wiki.parseText("text/vnd.tiddlywiki",this.value).tree;
 	}
 	// Clone and execute the parsed wikitext
 	for(t=0; t<children.length; t++) {
diff --git a/core/modules/parsers/javascriptparser/javascriptparser.js b/core/modules/parsers/javascriptparser/javascriptparser.js
index f1c8d63c5..6bdde3be1 100644
--- a/core/modules/parsers/javascriptparser/javascriptparser.js
+++ b/core/modules/parsers/javascriptparser/javascriptparser.js
@@ -63,13 +63,13 @@ JavaScriptParser.prototype.parse = function(type,code) {
                 element = "div";
                 classes.push("javascript-block-comment");
                 content.push($tw.Tree.Text("/*"));
-                content.push.apply(content,self.wiki.parseText("text/x-tiddlywiki",text).tree);
+                content.push.apply(content,self.wiki.parseText("text/vnd.tiddlywiki",text).tree);
                 content.push($tw.Tree.Text("*/"));
             } else {
                 element = "span";
                 classes.push("javascript-line-comment");
                 content.push($tw.Tree.Text("//"));
-                content.push.apply(content,self.wiki.parseText("text/x-tiddlywiki-run",text).tree);
+                content.push.apply(content,self.wiki.parseText("text/vnd.tiddlywiki-run",text).tree);
                 content.push($tw.Tree.Text("\n"));
             }
             result.push($tw.Tree.Element(element,{"class": classes},content));
diff --git a/core/modules/parsers/tiddlytextparser.js b/core/modules/parsers/tiddlytextparser.js
index 0daacfaa5..cfdae900a 100644
--- a/core/modules/parsers/tiddlytextparser.js
+++ b/core/modules/parsers/tiddlytextparser.js
@@ -58,7 +58,7 @@ TiddlyTextParser.prototype.parse = function(type,text) {
 	return new $tw.Renderer(output,dependencies);
 };
 
-exports["text/x-tiddlywiki-css"] = TiddlyTextParser;
-exports["text/x-tiddlywiki-html"] = TiddlyTextParser;
+exports["text/vnd.tiddlywiki-css"] = TiddlyTextParser;
+exports["text/vnd.tiddlywiki-html"] = TiddlyTextParser;
 
 })();
diff --git a/core/modules/parsers/wikitextparser/wikitextparser.js b/core/modules/parsers/wikitextparser/wikitextparser.js
index 491925853..dfd6395ab 100644
--- a/core/modules/parsers/wikitextparser/wikitextparser.js
+++ b/core/modules/parsers/wikitextparser/wikitextparser.js
@@ -288,12 +288,12 @@ WikiTextParser.prototype.parse = function(type,text) {
 	return new WikiTextRenderer(text,{
 		wiki: this.wiki,
 		parser: this,
-		isRun: type === "text/x-tiddlywiki-run"
+		isRun: type === "text/vnd.tiddlywiki-run"
 	});
 };
 
-exports["text/x-tiddlywiki"] = WikiTextParser;
+exports["text/vnd.tiddlywiki"] = WikiTextParser;
 
-exports["text/x-tiddlywiki-run"] = WikiTextParser;
+exports["text/vnd.tiddlywiki-run"] = WikiTextParser;
 
 })();
diff --git a/core/modules/utils/dom/modal.js b/core/modules/utils/dom/modal.js
index 50d00aa8a..c7eb0da0e 100644
--- a/core/modules/utils/dom/modal.js
+++ b/core/modules/utils/dom/modal.js
@@ -61,7 +61,7 @@ Modal.prototype.display = function(title,options) {
 	} else {
 		titleText = title;
 	}
-	var headerRenderer = this.wiki.parseText("text/x-tiddlywiki-run",titleText);
+	var headerRenderer = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText);
 	headerRenderer.execute([],title);
 	headerRenderer.renderInDom(headerTitle);
 	this.wiki.addEventListener("",function(changes) {
@@ -95,7 +95,7 @@ Modal.prototype.display = function(title,options) {
 	} else {
 		footerText = "<<button close class:'btn btn-primary'><Close>>";
 	}
-	var footerRenderer = this.wiki.parseText("text/x-tiddlywiki-run",footerText);
+	var footerRenderer = this.wiki.parseText("text/vnd.tiddlywiki-run",footerText);
 	footerRenderer.execute([],title);
 	footerRenderer.renderInDom(modalFooterButtons);
 	this.wiki.addEventListener("",function(changes) {
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 543ad1a0f..b80e90dde 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -397,7 +397,7 @@ exports.initParsers = function(moduleType) {
 		}
 	});
 	// Install the rules for the old wikitext parser rules
-	var wikitextparser = this.parsers["text/x-tiddlywiki-old"];
+	var wikitextparser = this.parsers["text/vnd.tiddlywiki2"];
 	if(wikitextparser) {
 		wikitextparser.installRules();
 	}
@@ -418,7 +418,7 @@ exports.parseText = function(type,text,options) {
 		parser = this.parsers[$tw.config.fileExtensionInfo[type].type];
 	}
 	if(!parser) {
-		parser = this.parsers[options.defaultType || "text/x-tiddlywiki"];
+		parser = this.parsers[options.defaultType || "text/vnd.tiddlywiki"];
 	}
 	if(!parser) {
 		return null;
diff --git a/core/templates/StaticContent.tid b/core/templates/StaticContent.tid
index 68c0101d4..1c89eab32 100644
--- a/core/templates/StaticContent.tid
+++ b/core/templates/StaticContent.tid
@@ -1,5 +1,5 @@
 title: $:/templates/StaticContent
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 
 <<! For Google, and people without JavaScript >>
 ((( [!is[shadow]sort[title]] )) <div><<view title text>></div> )
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
index 6805cffa4..f205da44f 100644
--- a/core/templates/static.template.html.tid
+++ b/core/templates/static.template.html.tid
@@ -1,5 +1,5 @@
 title: $:/core/templates/static.template.html
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 <!doctype html>
 <head>
diff --git a/core/templates/tiddlywiki5.encrypted.template.html.tid b/core/templates/tiddlywiki5.encrypted.template.html.tid
index 0d5c1e51e..585f9497d 100644
--- a/core/templates/tiddlywiki5.encrypted.template.html.tid
+++ b/core/templates/tiddlywiki5.encrypted.template.html.tid
@@ -1,5 +1,5 @@
 title: $:/core/templates/tiddlywiki5.encrypted.template.html
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 <!doctype html>
 <head>
diff --git a/core/templates/tiddlywiki5.template.html.tid b/core/templates/tiddlywiki5.template.html.tid
index c60219b7c..590858687 100644
--- a/core/templates/tiddlywiki5.template.html.tid
+++ b/core/templates/tiddlywiki5.template.html.tid
@@ -1,5 +1,5 @@
 title: $:/core/templates/tiddlywiki5.template.html
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 <!doctype html>
 <head>
diff --git a/core/wiki/title.tid b/core/wiki/title.tid
index bee005e52..dd1a381f0 100644
--- a/core/wiki/title.tid
+++ b/core/wiki/title.tid
@@ -1,4 +1,4 @@
 title: $:/core/wiki/title
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 
 <<tiddler SiteTitle>> --- <<tiddler SiteSubtitle>>
\ No newline at end of file
diff --git a/editions/tw2/wiki/tiddlywiki2.template.html.tid b/editions/tw2/wiki/tiddlywiki2.template.html.tid
index 9952a2ffe..71eabc5e1 100644
--- a/editions/tw2/wiki/tiddlywiki2.template.html.tid
+++ b/editions/tw2/wiki/tiddlywiki2.template.html.tid
@@ -1,5 +1,5 @@
 title: $:/core/templates/tiddlywiki2.template.html
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/editions/tw5.com/tiddlers/HelloThere.tid b/editions/tw5.com/tiddlers/HelloThere.tid
index 176e4568e..7e73ffc46 100644
--- a/editions/tw5.com/tiddlers/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/HelloThere.tid
@@ -1,7 +1,7 @@
 title: HelloThere
 modifier: JeremyRuston
 tags: introduction greetings
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 modified: 201208121934
 
 Welcome to TiddlyWiki5, a reboot of TiddlyWiki, the reusable non-linear personal web notebook [[first released in 2004|History]]. It is a complete interactive wiki in JavaScript that can be run from a single HTML file in the browser or as a powerful [[node.js application|node.js]].
diff --git a/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid b/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid
index b2194c313..852a35e60 100644
--- a/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid
+++ b/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid
@@ -6,7 +6,7 @@ tags: docs internals
 
 The heart of TiddlyWiki can be seen as an extensible representation transformation engine. Given the text of a tiddler and its associated ContentType, the engine can produce a rendering of the tiddler in a new ContentType. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents.
 
-The most important transformations are from `text/x-tiddlywiki` wikitext into `text/html` or `text/plain` but the engine is used throughout the system for other transformations, such as converting images for display in HTML, sanitising fragments of JavaScript, and processing CSS.
+The most important transformations are from `text/vnd.tiddlywiki` wikitext into `text/html` or `text/plain` but the engine is used throughout the system for other transformations, such as converting images for display in HTML, sanitising fragments of JavaScript, and processing CSS.
 
 You can explore this mechanism by opening the JavaScript console in your browser. Typing this command will replace the text of the tiddler `HelloThere` with new content:
 
diff --git a/editions/tw5.com/tiddlers/concepts/WikiText.tid b/editions/tw5.com/tiddlers/concepts/WikiText.tid
index 7ce1b0091..e804acc8d 100644
--- a/editions/tw5.com/tiddlers/concepts/WikiText.tid
+++ b/editions/tw5.com/tiddlers/concepts/WikiText.tid
@@ -1,5 +1,5 @@
 title: WikiText
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 tags: docs concepts
 
 WikiText is a concise, expressive way of typing a wide range of text formatting, hypertext and interactive features. It allows you to focus on writing without a complex user interface getting in the way. It is somewhat similar to [[MarkDown|http://daringfireball.net/projects/markdown/]], but with more of a focus on linking and the interactive features.
diff --git a/editions/tw5.com/tiddlers/mechanisms/ParsingMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/ParsingMechanism.tid
index 356d06806..eb06b4ef6 100644
--- a/editions/tw5.com/tiddlers/mechanisms/ParsingMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/ParsingMechanism.tid
@@ -13,13 +13,13 @@ The parse tree is built when needed, and then cached by the WikiStore until the
 
 TiddlyWiki5 uses multiple parsers:
 
-* Wikitext ({{{text/x-tiddlywiki}}}) in `js/WikiTextParser.js`
+* Wikitext ({{{text/vnd.tiddlywiki}}}) in `js/WikiTextParser.js`
 * JavaScript ({{{text/javascript}}}) in `js/JavaScriptParser.js`
 * Images ({{{image/png}}} and {{{image/jpg}}}) in `js/ImageParser.js`
 * JSON ({{{application/json}}}) in `js/JSONParser.js`
 Additional parsers are planned:
 * CSS ({{{text/css}}})
-* Recipe ({{{text/x-tiddlywiki-recipe}}})
+* Recipe ({{{text/vnd.tiddlywiki-recipe}}})
 
 One global instance of each parser is instantiated in `js/App.js` and registered with the main WikiStore object.
 
diff --git a/editions/tw5dropbox/appwiki/wiki/index.template.html.tid b/editions/tw5dropbox/appwiki/wiki/index.template.html.tid
index eb5b0e1b8..bb89da615 100644
--- a/editions/tw5dropbox/appwiki/wiki/index.template.html.tid
+++ b/editions/tw5dropbox/appwiki/wiki/index.template.html.tid
@@ -1,5 +1,5 @@
 title: $:/plugins/dropbox/index.template.html
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 <!doctype html>
 <head>
diff --git a/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid b/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid
index 19f471167..4f5027b0f 100644
--- a/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid
+++ b/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid
@@ -1,5 +1,5 @@
 title: $:/plugins/dropbox/styles.template.css
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 /* utf8beacon: éçñøåá— */
 <<serialize "[is[shadow]type[text/css]]" text/plain>>
diff --git a/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid b/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid
index 3f78ec3e9..d3e257c77 100644
--- a/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid
+++ b/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid
@@ -1,5 +1,5 @@
 title: $:/plugins/dropbox/tw5dropbox.template.js
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 /* utf8beacon: éçñøåá— */
 <<serialize "[is[shadow]type[application/javascript]library[yes]] -[[$:/library/sjcl.js]]" text/plain>>
diff --git a/editions/tw5dropbox/dummycontent/HelloThere.tid b/editions/tw5dropbox/dummycontent/HelloThere.tid
index 2ba8513ca..4e70f7c02 100644
--- a/editions/tw5dropbox/dummycontent/HelloThere.tid
+++ b/editions/tw5dropbox/dummycontent/HelloThere.tid
@@ -1,7 +1,7 @@
 title: HelloThere
 modifier: JeremyRuston
 tags: introduction greetings
-type: text/x-tiddlywiki
+type: text/vnd.tiddlywiki
 
 Welcome to TiddlyWiki5, a reboot of TiddlyWiki, the reusable non-linear personal web notebook [[first released in 2004|History]]. It is a complete interactive wiki in JavaScript that can be run from a single HTML file in the browser or as a powerful [[node.js application|node.js]].
 
diff --git a/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid b/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid
index b5c563d2d..4984575c5 100644
--- a/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid
+++ b/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid
@@ -1,5 +1,5 @@
 title: $:/plugins/dropbox/index.template.html
-type: text/x-tiddlywiki-html
+type: text/vnd.tiddlywiki-html
 
 <!doctype html>
 <head>
diff --git a/plugins/tiddlywiki/dropbox/dropbox.js b/plugins/tiddlywiki/dropbox/dropbox.js
index 843ff96ed..b7429c651 100644
--- a/plugins/tiddlywiki/dropbox/dropbox.js
+++ b/plugins/tiddlywiki/dropbox/dropbox.js
@@ -424,7 +424,7 @@ $tw.plugins.dropbox.syncChanges = function(changes,wiki) {
 		var tiddler = wiki.getTiddler(title),
 			filename = $tw.plugins.dropbox.titleInfo[title],
 			contentType = tiddler ? tiddler.fields.type : null;
-		contentType = contentType || "text/x-tiddlywiki";
+		contentType = contentType || "text/vnd.tiddlywiki";
 		var contentTypeInfo = $tw.config.contentTypeInfo[contentType],
 			isNew = false;
 		// Figure out the pathname of the tiddler
@@ -436,7 +436,7 @@ $tw.plugins.dropbox.syncChanges = function(changes,wiki) {
 		}
 		// Push the appropriate task
 		if(tiddler) {
-			if(contentType === "text/x-tiddlywiki") {
+			if(contentType === "text/vnd.tiddlywiki") {
 				// .tid file
 				q.push({
 					type: "save",
diff --git a/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js b/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
index b6b832898..37273553c 100644
--- a/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
+++ b/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
@@ -219,7 +219,7 @@ TiddlyWebSyncer.prototype.convertTiddler = function(tiddlerFields) {
 	if(result.type === "text/javascript") {
 		result.type = "application/javascript";
 	} else if(!result.type || result.type === "None") {
-		result.type = "text/x-tiddlywiki-old";
+		result.type = "text/vnd.tiddlywiki2";
 	}
 	return result;
 };
diff --git a/plugins/tiddlywiki/tw2parser/wikitextparser.js b/plugins/tiddlywiki/tw2parser/wikitextparser.js
index 74fc36584..832387312 100644
--- a/plugins/tiddlywiki/tw2parser/wikitextparser.js
+++ b/plugins/tiddlywiki/tw2parser/wikitextparser.js
@@ -183,6 +183,6 @@ WikiTextParser.prototype.subWikifyTerm = function(output,terminatorRegExp) {
 	this.output = oldOutput;
 };
 
-exports["text/x-tiddlywiki-old"] = WikiTextParser;
+exports["text/vnd.tiddlywiki2"] = WikiTextParser;
 
 })();
diff --git a/readme.md b/readme.md
index f4379a897..713f3e2ea 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-<h1> Welcome to <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a></h1><div class=''><p>Welcome to <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a>, a reboot of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a>, the reusable non-linear personal web notebook <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='History'>first released in 2004</a>. It is a complete interactive wiki in <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> that can be run from a single HTML file in the browser or as a powerful <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='node.js'>node.js application</a>.</p><p><a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> is designed to fit around your brain, giving you a better way of managing information compared to traditional documents and emails. The fundamental idea is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks &ndash; <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Tiddlers'>tiddlers</a> &ndash; and give them titles so that they can be structured with links, tags and macros.  <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.</p><p><a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a> has many <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Improvements'>improvements</a> over the original. It is currently labelled alpha, meaning it is working but incomplete. It is the best possible time to get involved and support its future development. You can:</p><ul><li> Explore its features online at <a class='tw-tiddlylink tw-tiddlylink-external' href='http://five.tiddlywiki.com/'>http://five.tiddlywiki.com/</a></li><li> Get involved in the <a class='tw-tiddlylink tw-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5'>development on GitHub</a></li><li> Join the discussions on <a class='tw-tiddlylink tw-tiddlylink-external' href='http://groups.google.com/group/TiddlyWikiDev'>the TiddlyWikiDev Google Group</a></li><li> Follow <a class='tw-tiddlylink tw-tiddlylink-external' href='http://twitter.com/#!/TiddlyWiki'>@TiddlyWiki on Twitter</a> for the latest news</li></ul><div class='tw-reveal' style='display:none;'></div></div><h1> Usage</h1><div class='tw-tiddler-missing'></div><h1> Architecture</h1><div class=''><h1> Overview</h1><p>The heart of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> can be seen as an extensible representation transformation engine. Given the text of a tiddler and its associated <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='ContentType'>ContentType</a>, the engine can produce a rendering of the tiddler in a new <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='ContentType'>ContentType</a>. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents.</p><p>The most important transformations are from <code>text/x-tiddlywiki</code> wikitext into <code>text/html</code> or <code>text/plain</code> but the engine is used throughout the system for other transformations, such as converting images for display in HTML, sanitising fragments of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a>, and processing CSS.</p><p>You can explore this mechanism by opening the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> console in your browser. Typing this command will replace the text of the tiddler <code>HelloThere</code> with new content:</p><pre>$tw.wiki.addTiddler({title: &quot;HelloThere&quot;, text: &quot;This is some new content&quot;});</pre><p>If the tiddler <code>HelloThere</code> is visible then you'll see it instantly change to reflect the new content. If you create a tiddler that doesn't currently exist then you'll see any displayed links to it instantly change from italicised to normal:</p><pre>$tw.wiki.addTiddler({title: &quot;TiddlyWiki5&quot;, text: &quot;This tiddler now exists&quot;});</pre><p>The power of this mechanism also drives the interactive features of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a>. For example, try typing the following into the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> console:</p><pre>$tw.wiki.addTiddler({title: &quot;ViewDropDownState&quot;, text: &quot;(50,50,200,200)&quot;});</pre><p>You should see the view dropdown appear in the middle of the screen. The underlying mechanism is that the creation of the tiddler with this title triggers the display of the popup at the specified location.</p><p>If you're interested in understanding more about the internal operation of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a>, it is recommended that you review the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Docs'>Docs</a> and read the code &ndash; start with the boot kernel <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='%24%3A%2Fcore%2Fboot.js'>$:/core/boot.js</a>.
+<h1> Welcome to <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a></h1><div class=''><p>Welcome to <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a>, a reboot of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a>, the reusable non-linear personal web notebook <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='History'>first released in 2004</a>. It is a complete interactive wiki in <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> that can be run from a single HTML file in the browser or as a powerful <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='node.js'>node.js application</a>.</p><p><a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> is designed to fit around your brain, giving you a better way of managing information compared to traditional documents and emails. The fundamental idea is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks &ndash; <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Tiddlers'>tiddlers</a> &ndash; and give them titles so that they can be structured with links, tags and macros.  <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.</p><p><a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a> has many <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Improvements'>improvements</a> over the original. It is currently labelled alpha, meaning it is working but incomplete. It is the best possible time to get involved and support its future development. You can:</p><ul><li> Explore its features online at <a class='tw-tiddlylink tw-tiddlylink-external' href='http://five.tiddlywiki.com/'>http://five.tiddlywiki.com/</a></li><li> Get involved in the <a class='tw-tiddlylink tw-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5'>development on GitHub</a></li><li> Join the discussions on <a class='tw-tiddlylink tw-tiddlylink-external' href='http://groups.google.com/group/TiddlyWikiDev'>the TiddlyWikiDev Google Group</a></li><li> Follow <a class='tw-tiddlylink tw-tiddlylink-external' href='http://twitter.com/#!/TiddlyWiki'>@TiddlyWiki on Twitter</a> for the latest news</li></ul><div class='tw-reveal' style='display:none;'></div></div><h1> Usage</h1><div class='tw-tiddler-missing'></div><h1> Architecture</h1><div class=''><h1> Overview</h1><p>The heart of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> can be seen as an extensible representation transformation engine. Given the text of a tiddler and its associated <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='ContentType'>ContentType</a>, the engine can produce a rendering of the tiddler in a new <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='ContentType'>ContentType</a>. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents.</p><p>The most important transformations are from <code>text/vnd.tiddlywiki</code> wikitext into <code>text/html</code> or <code>text/plain</code> but the engine is used throughout the system for other transformations, such as converting images for display in HTML, sanitising fragments of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a>, and processing CSS.</p><p>You can explore this mechanism by opening the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> console in your browser. Typing this command will replace the text of the tiddler <code>HelloThere</code> with new content:</p><pre>$tw.wiki.addTiddler({title: &quot;HelloThere&quot;, text: &quot;This is some new content&quot;});</pre><p>If the tiddler <code>HelloThere</code> is visible then you'll see it instantly change to reflect the new content. If you create a tiddler that doesn't currently exist then you'll see any displayed links to it instantly change from italicised to normal:</p><pre>$tw.wiki.addTiddler({title: &quot;TiddlyWiki5&quot;, text: &quot;This tiddler now exists&quot;});</pre><p>The power of this mechanism also drives the interactive features of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a>. For example, try typing the following into the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> console:</p><pre>$tw.wiki.addTiddler({title: &quot;ViewDropDownState&quot;, text: &quot;(50,50,200,200)&quot;});</pre><p>You should see the view dropdown appear in the middle of the screen. The underlying mechanism is that the creation of the tiddler with this title triggers the display of the popup at the specified location.</p><p>If you're interested in understanding more about the internal operation of <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a>, it is recommended that you review the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Docs'>Docs</a> and read the code &ndash; start with the boot kernel <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='%24%3A%2Fcore%2Fboot.js'>$:/core/boot.js</a>.
 </p></div><h1> Boot Mechanism</h1><div class=''><h1>Introduction</h1><p><a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a> is based on a 1,000 line boot kernel that runs on node.js or in the browser, with all other functionality added via dynamically loaded modules.</p><p>The kernel boots just enough of the <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> environment to allow it to load tiddlers and execute <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> modules. Plugin modules are written like <code>node.js</code> modules.</p><p>There are many <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='ModuleType'>different types of module</a>: parsers, serializers, deserializers, macros etc. It goes much further than you might expect. For example, individual tiddler fields are modules, too: there's a module that knows how to handle the <code>tags</code> field, and another that knows how to handle the special behaviour of the <code>modified</code> and <code>created</code> fields.</p><p>Some plugin modules have further sub-plugins: the wikitext parser, for instance, accepts rules as individual plugin modules.</p><h1>Plugins and Modules</h1><p>In <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a>, <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Plugins'>Plugins</a> are bundles of tiddlers that are distributed and managed as one; <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='Modules'>Modules</a> are <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> tiddlers with a module type identifying when and how they should be executed.</p><p>The tiddler <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='%24%3A%2Fcore%2Fboot.js'>$:/core/boot.js</a> is a barebones <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves' href='TiddlyWiki'>TiddlyWiki</a> kernel that is just sufficient to load the core plugin modules and trigger a startup module to load up the rest of the application.</p><p>The kernel includes:</p><ul><li> Several short shared utility functions</li><li> A handful of methods implementing the plugin module mechanism</li><li> The <code>$tw.Tiddler</code> class (and field definition plugins)</li><li> The <code>$tw.Wiki</code> class (and tiddler deserialization methods)</li><li> Code for the browser to load tiddlers from the HTML DOM</li><li> Code for the server to load tiddlers from the file system</li></ul><p>Each module is an ordinary <code>node.js</code>-style module, using the <code>require()</code> function to access other modules and the <code>exports</code> global to return <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> values. The boot kernel smooths over the differences between <code>node.js</code> and the browser, allowing the same plugin modules to execute in both environments.</p><p>In the browser, <code>core/boot.js</code> is packed into a template HTML file that contains the following elements in order:</p><ul><li> Ordinary and shadow tiddlers, packed as HTML <code>&lt;DIV&gt;</code> elements</li><li> <code>core/bootprefix.js</code>, containing a few lines to set up the plugin environment</li><li> <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='JavaScript'>JavaScript</a> modules, packed as HTML <code>&lt;SCRIPT&gt;</code> blocks</li><li> <code>core/boot.js</code>, containing the boot kernel</li></ul><p>On the server, <code>core/boot.js</code> is executed directly. It uses the <code>node.js</code> local file API to load plugins directly from the file system in the <code>core/modules</code> directory. The code loading is performed synchronously for brevity (and because the system is in any case inherently blocked until plugins are loaded).</p><p>The boot kernel sets up the <code>$tw</code> global variable that is used to store all the state data of the system.
 </p></div><p><em>This <code>readme</code> file was automatically generated by <a class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing' href='TiddlyWiki5'>TiddlyWiki5</a></em>
 </p>
\ No newline at end of file
diff --git a/tests/wikitests/EighthTiddler.tid b/tests/wikitests/EighthTiddler.tid
index f5d64baaa..169a4a319 100644
--- a/tests/wikitests/EighthTiddler.tid
+++ b/tests/wikitests/EighthTiddler.tid
@@ -1,5 +1,5 @@
 title: EighthTiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 <<tiddler SixthTiddler>>
 <<tiddler target:SixthTiddler>>
diff --git a/tests/wikitests/Fifth Tiddler.tid b/tests/wikitests/Fifth Tiddler.tid
index 2d095c6d3..323883542 100644
--- a/tests/wikitests/Fifth Tiddler.tid	
+++ b/tests/wikitests/Fifth Tiddler.tid	
@@ -1,5 +1,5 @@
 title: Fifth Tiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 |A caption above the table|c
 | Left | Middle | Right |h
diff --git a/tests/wikitests/FirstTiddler.tid b/tests/wikitests/FirstTiddler.tid
index c5ac31202..38cd5a168 100644
--- a/tests/wikitests/FirstTiddler.tid
+++ b/tests/wikitests/FirstTiddler.tid
@@ -1,4 +1,4 @@
 title: FirstTiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 This is the ''text'' of the first tiddler, with a @@font-size:8em;color:red;link@@ to the SecondTiddler, too. And a link to http://tiddlywiki.com/.
diff --git a/tests/wikitests/Fourth Tiddler.tid b/tests/wikitests/Fourth Tiddler.tid
index 282644707..41e018dde 100644
--- a/tests/wikitests/Fourth Tiddler.tid	
+++ b/tests/wikitests/Fourth Tiddler.tid	
@@ -1,4 +1,4 @@
 title: Fourth Tiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 A missing image [img[Something.jpg]] and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot;
\ No newline at end of file
diff --git a/tests/wikitests/SecondTiddler.tid b/tests/wikitests/SecondTiddler.tid
index 13c8364c1..758af7530 100644
--- a/tests/wikitests/SecondTiddler.tid
+++ b/tests/wikitests/SecondTiddler.tid
@@ -1,5 +1,5 @@
 title: SecondTiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 !!Heading
 This is the second tiddler. It has a list:
diff --git a/tests/wikitests/SeventhTiddler.tid b/tests/wikitests/SeventhTiddler.tid
index 075712736..f92f4de90 100644
--- a/tests/wikitests/SeventhTiddler.tid
+++ b/tests/wikitests/SeventhTiddler.tid
@@ -1,5 +1,5 @@
 title: SeventhTiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 <<echo {{2+2}}>>
 
diff --git a/tests/wikitests/SixthTiddler.tid b/tests/wikitests/SixthTiddler.tid
index 96a0f8243..58d04c94f 100644
--- a/tests/wikitests/SixthTiddler.tid
+++ b/tests/wikitests/SixthTiddler.tid
@@ -1,5 +1,5 @@
 title: SixthTiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 modified: 20110211110621
 modifier: Jermolene
 
diff --git a/tests/wikitests/ThirdTiddler.tid b/tests/wikitests/ThirdTiddler.tid
index ff35950b4..651a2c2dd 100644
--- a/tests/wikitests/ThirdTiddler.tid
+++ b/tests/wikitests/ThirdTiddler.tid
@@ -1,5 +1,5 @@
 title: ThirdTiddler
-type: text/x-tiddlywiki-old
+type: text/vnd.tiddlywiki2
 
 An explicit link [[Fourth Tiddler]] and [[a pretty link|Fourth Tiddler]] and a transclusion <<tiddler [[Fourth Tiddler]] with:Stringy>>