diff --git a/editions/tw5.com/tiddlers/Default to the contents tab.tid b/editions/tw5.com/tiddlers/Default to the contents tab.tid
new file mode 100644
index 000000000..cb2fabe83
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Default to the contents tab.tid	
@@ -0,0 +1,3 @@
+title: $:/state/tab/sidebar-{-1835078512}
+
+TableOfContents
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/HelloThere/Discover TiddlyWiki.tid b/editions/tw5.com/tiddlers/HelloThere/Discover TiddlyWiki.tid
index c6fe3d7a2..3c725a9a4 100644
--- a/editions/tw5.com/tiddlers/HelloThere/Discover TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/HelloThere/Discover TiddlyWiki.tid	
@@ -3,11 +3,33 @@ tags: HelloThere
 created: 201409041210
 modified: 201409041210
 
-Unless you've already seen ~TiddlyWiki, we guarantee you, you've never seen //anything// like ~TiddlyWiki. ~TiddlyWiki is 
+Unless you've already seen ~TiddlyWiki, we guarantee you've never seen //anything// like ~TiddlyWiki. ~TiddlyWiki is:
 
-::a tool, 
-::a toolbox, 
-::a community, 
-::and a philosophy. 
+:: a tool, 
+:: a toolbox, 
+:: a community, 
+:: and a philosophy. 
 
-Click on the following link to start a four-tiddler journey describing the nature of ~TiddlyWiki. Next: [[TiddlyWiki is a tool]]
+! ~TiddlyWiki is a Tool
+
+''~TiddlyWiki is first and foremost a tool:'' it is a free downloadable tool for capturing and organising content from the web, from your documents or from your brain. It’s a tool for note-taking, bookmarking, pinning, writing, managing to-do lists and projects, collaborating, blogging, and publishing.
+
+In ~TiddlyWiki you create or paste content into notes called tiddlers, then connect your tiddlers with hyperlinks and tags. You can then quickly retrieve your notes through features such as tag pills, sidebar tabs, and ~TiddlyWiki's lightning fast search window. You can even dynamically include one tiddler's content inside another - similar to using building blocks - to create articles, lists, presentations and more.
+
+! ~TiddlyWiki is a Toolbox
+
+In addition to being a versatile tool, ''~TiddlyWiki is also a toolbox.''
+
+Where other note-taking products hook you with the basic program then charge you for the really helpful features, ~TiddlyWiki has an ever-expanding collection of completely free visual themes, colour palettes, plugins, widgets and macros, which you can then mix and match so that you can tweak and tailor your ~TiddlyWiki to get it just the way you want it. 
+
+! ~TiddlyWiki is also a Community
+
+We are a community of users and developers who help each other imagine new ways of thinking and organising and create new solutions, so that ~TiddlyWiki is continually adapting to better serve your needs. ~TiddlyWiki users and developers share questions and advice at a ~TiddlyWiki Google group. They also create tutorials, adaptations, and plugins to enhance your ~TiddlyWiki experience. See the section ''Get help and learn more'' of the TableOfContents for more details.
+
+! Finally, ~TiddlyWiki is a philosophy
+
+The purpose of taking and organising a note (or recording any kind of content) is to be able to retrieve it later. If you can't find your notes in your note-taking system, your note-taking becomes a colossal waste of time.
+
+The ~TiddlyWiki philosophy is that the best way to take notes is to separate them into tiddlers, the smallest semantic units possible. A tiddler might be an image, a webpage link, a concept, the definition of a term, or a formula such as a macro.
+
+These tiddlers can then be woven together to create longer units: stories, articles, lists, image galleries, and much more. ~TiddlyWiki's features such as tagging, hyperlinking, and list filters are specially designed to help you relate and connect tiddlers together in multiple ways, facilitating your future retrieval of your notes and even helping you see unexpected relationships among the your tiddlers and the information they contain.
diff --git a/editions/tw5.com/tiddlers/HelloThere/Some of the things you can do with TiddlyWiki.tid b/editions/tw5.com/tiddlers/HelloThere/Some of the things you can do with TiddlyWiki.tid
index d1aead0aa..22f184527 100644
--- a/editions/tw5.com/tiddlers/HelloThere/Some of the things you can do with TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/HelloThere/Some of the things you can do with TiddlyWiki.tid	
@@ -3,18 +3,18 @@ tags: HelloThere
 created: 201409040903
 modified: 201409040903
 
-*Take notes, and use tags and hyperlinking to form relationships between your notes
-*Use tabs, tables, tag-based lists, and tables of contents to get organzed
-*Bookmark your favorite websites (see an example at http://giffmex.org/experiments/tidmarks.html)
-*Keep track of tasks and appointments, and organize them by multiple tags (see our TaskManagementExample)
-*Inventory just about anything: your recipes, personal library, contacts, music collection, and more
-*Create a blog or website
-*Write a book
-*Organize your images into galleries (see our [[ImageGallery Example]])
-*Share the information in your ~TiddlyWiki with others, as an online file, as a file attachment, as a tiddler file, or as a link to a specific online tiddler (try clicking and dragging a tiddler from one ~TiddlyWiki file to another to see what happens)
-*Draw a sketch (Edit [[Motovun Jack.jpg]] and start drawing over the image to see what happens)
-*Create a modal wizard (also known as a lightbox) - see SampleWizard
-*Create a slideshow presentation
-*Set up an entire local or online knowledgebase, with a central ~TiddlyWiki file linking to other ~TiddlyWiki files (http://recursos.giffmex.org is a Spanish online example of this)
-*Set up a data visualization using tiddlers as data (see the visualizations at http://tiddlywiki.com/d3demo.html)
-*Create a timeline (See http://emkayonline.github.io/tw5visjs/#ShowTimelineDemo)
+* Take notes, and use tags and hyperlinking to form relationships between your notes
+* Use tabs, tables, tag-based lists, and tables of contents to get organzed
+* Bookmark your favorite websites (see an example at http://giffmex.org/experiments/tidmarks.html)
+* Keep track of tasks and appointments, and organize them by multiple tags (see our TaskManagementExample)
+* Inventory just about anything: your recipes, personal library, contacts, music collection, and more
+* Create a blog or website
+* Write a book
+* Organize your images into galleries (see our [[ImageGallery Example]])
+* Share the information in your ~TiddlyWiki with others, as an online file, as a file attachment, as a tiddler file, or as a link to a specific online tiddler (try clicking and dragging a tiddler from one ~TiddlyWiki file to another to see what happens)
+* Draw a sketch (Edit [[Motovun Jack.jpg]] and start drawing over the image to see what happens)
+* Create a modal wizard (also known as a lightbox) - see SampleWizard
+* Create a slideshow presentation
+* Set up an entire local or online knowledgebase, with a central ~TiddlyWiki file linking to other ~TiddlyWiki files (http://recursos.giffmex.org is a Spanish online example of this)
+* Set up a data visualization using tiddlers as data (see the visualizations at http://tiddlywiki.com/d3demo.html)
+* Create a timeline (See http://emkayonline.github.io/tw5visjs/#ShowTimelineDemo)
diff --git a/editions/tw5.com/tiddlers/HelloThere/Ten reasons to switch to TiddlyWiki.tid b/editions/tw5.com/tiddlers/HelloThere/Ten reasons to switch to TiddlyWiki.tid
index a48ef8e07..97abff280 100644
--- a/editions/tw5.com/tiddlers/HelloThere/Ten reasons to switch to TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/HelloThere/Ten reasons to switch to TiddlyWiki.tid	
@@ -3,17 +3,15 @@ tags: HelloThere
 created: 201409040857
 modified: 201409040857
 
-<span class="doublespacedlist">
-
-#With ~TiddlyWiki you can organize your notes your way, not their way. Your notes conform to your way of thinking rather than being forced into a hierarchical straightjacket of notebooks and tabs.
-#~TiddlyWiki's nonlinear approach will actually make you think about your information in new and helpful ways.
-#Finding your notes in ~TiddlyWiki is lightning fast
-#There are many ways to customize and adapt every aspect of ~TiddlyWiki
-#~TiddlyWiki is free and is compatible with all platforms. Any web browser will open it. You don't need to purchase an expensive program or pay a subscription fee to use it.
-#~TiddlyWiki files promote the free sharing of information. There are many ways you can share your information from ~TiddlyWiki.
-#With ~TiddlyWiki, your information is yours, and you store it where you want to - on your device, on a USB stick, in Dropbox, on your server.
-#~TiddlyWiki features an ever-growing number of plugins, themes, widgets, and languages.
-#The online ~TiddlyWiki community is friendly and will do their best to give you the help you need.
-#If you are a programmer, you have even more ways to play with ~TiddlyWiki. With ~TiddlyWiki, the more you know, the more fun you can have with it.
-
-</span>
+@@.doublespacedlist
+# With ~TiddlyWiki you can organize your notes your way, not their way. Your notes conform to your way of thinking rather than being forced into a hierarchical straightjacket of notebooks and tabs.
+# ~TiddlyWiki's nonlinear approach will actually make you think about your information in new and helpful ways.
+# Finding your notes in ~TiddlyWiki is lightning fast
+# There are many ways to customize and adapt every aspect of ~TiddlyWiki
+# ~TiddlyWiki is free and is compatible with all platforms. Any web browser will open it. You don't need to purchase an expensive program or pay a subscription fee to use it.
+# ~TiddlyWiki files promote the free sharing of information. There are many ways you can share your information from ~TiddlyWiki.
+# With ~TiddlyWiki, your information is yours, and you store it where you want to - on your device, on a USB stick, in Dropbox, on your server.
+# ~TiddlyWiki features an ever-growing number of plugins, themes, widgets, and languages.
+# The online ~TiddlyWiki community is friendly and will do their best to give you the help you need.
+# If you are a programmer, you have even more ways to play with ~TiddlyWiki. With ~TiddlyWiki, the more you know, the more fun you can have with it.
+@@
diff --git a/editions/tw5.com/tiddlers/HelloThere/The history of TiddlyWiki.tid b/editions/tw5.com/tiddlers/HelloThere/The history of TiddlyWiki.tid
deleted file mode 100644
index 293f57864..000000000
--- a/editions/tw5.com/tiddlers/HelloThere/The history of TiddlyWiki.tid	
+++ /dev/null
@@ -1,6 +0,0 @@
-title: The history of TiddlyWiki
-tags: HelloThere
-created: 201409081144
-modified: 201409081144
-
-Forthcoming...
diff --git a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a community.tid b/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a community.tid
deleted file mode 100644
index 7d7a78f54..000000000
--- a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a community.tid	
+++ /dev/null
@@ -1,10 +0,0 @@
-title: TiddlyWiki is a community
-tags:
-created: 201409041226
-modified: 201409041226
-
-''~TiddlyWiki is also a community:'' 
-
-We are a community of users and developers who help each other imagine new ways of thinking and organising and create new solutions, so that ~TiddlyWiki is continually adapting to better serve your needs. ~TiddlyWiki users and developers share questions and advice at a ~TiddlyWiki Google group. They also create tutorials, adaptations, and plugins to enhance your ~TiddlyWiki experience. See the section ''Get help and learn more'' of the TableOfContents for more details.
-
-Next: [[TiddlyWiki is a philosophy]]
diff --git a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a philosophy.tid b/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a philosophy.tid
deleted file mode 100644
index 3bb10fd19..000000000
--- a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a philosophy.tid	
+++ /dev/null
@@ -1,14 +0,0 @@
-title: TiddlyWiki is a philosophy
-tags:
-created: 201409041229
-modified: 201409041229
-
-Finally, ''~TiddlyWiki is a philosophy.'' 
-
-The purpose of taking and organising a note (or recording any kind of content) is to be able to retrieve it later. If you can't find your notes in your note-taking system, your note-taking becomes a colossal waste of time.
-
-The ~TiddlyWiki philosophy is that the best way to take notes is to separate them into tiddlers, the smallest semantic units possible. A tiddler might be an image, a webpage link, a concept, the definition of a term, or a formula such as a macro.
-
-These tiddlers can then be woven together to create longer units: stories, articles, lists, image galleries, and much more. ~TiddlyWiki's features such as tagging, hyperlinking, and list filters are specially designed to help you relate and connect tiddlers together in multiple ways, facilitating your future retrieval of your notes and even helping you see unexpected relationships among the your tiddlers and the information they contain.
-
-Your tour is done! Click the link to return to [[HelloThere]]
diff --git a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a tool.tid b/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a tool.tid
deleted file mode 100644
index 8d61e933c..000000000
--- a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a tool.tid	
+++ /dev/null
@@ -1,10 +0,0 @@
-title: TiddlyWiki is a tool
-tags:
-created: 201409041214
-modified: 201409041214
-
-''~TiddlyWiki is first and foremost a tool:'' it is a free downloadable tool for capturing and organising content from the web, from your documents or from your brain. It’s a tool for note-taking, bookmarking, pinning, writing, managing to-do lists and projects, collaborating, blogging, and publishing.
-
-In ~TiddlyWiki you create or paste content into notes called tiddlers, then connect your tiddlers with hyperlinks and tags. You can then quickly retrieve your notes through features such as tag pills, sidebar tabs, and ~TiddlyWiki's lightning fast search window. You can even dynamically include one tiddler's content inside another - similar to using building blocks - to create articles, lists, presentations and more.
-
-Next: [[TiddlyWiki is a toolbox]]
diff --git a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a toolbox.tid b/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a toolbox.tid
deleted file mode 100644
index ac3019158..000000000
--- a/editions/tw5.com/tiddlers/HelloThere/TiddlyWiki is a toolbox.tid	
+++ /dev/null
@@ -1,10 +0,0 @@
-title: TiddlyWiki is a toolbox
-tags:
-created: 201409041222
-modified: 201409041222
-
-In addition to being a versatile tool, ''~TiddlyWiki is also a toolbox.''
-
-Where other note-taking products hook you with the basic program then charge you for the really helpful features, ~TiddlyWiki has an ever-expanding collection of completely free visual themes, colour palettes, plugins, widgets and macros, which you can then mix and match so that you can tweak and tailor your ~TiddlyWiki to get it just the way you want it. 
-
-Next: [[TiddlyWiki is a community]]
diff --git a/editions/tw5.com/tiddlers/HelloThere/What happened to the other TiddlyWiki.tid b/editions/tw5.com/tiddlers/HelloThere/What happened to the other TiddlyWiki.tid
deleted file mode 100644
index 16d48dcd5..000000000
--- a/editions/tw5.com/tiddlers/HelloThere/What happened to the other TiddlyWiki.tid	
+++ /dev/null
@@ -1,13 +0,0 @@
-title: What happened to the other TiddlyWiki?
-tags: HelloThere
-created: 201409040851
-modified: 201409040851
-
-<div class="tc-message-box">
-
-<a class="tc-message-icon" href="http://classic.tiddlywiki.com/" target="_blank">{{TiddlyWiki Classic.png}}</a>
-
-!! TiddlyWikiClassic
-
-The original "Classic" version of TiddlyWiki is still available at http://classic.tiddlywiki.com. While it is not fully backwards compatible, we are currently improving the upgrade process.
-</div>
diff --git a/editions/tw5.com/tiddlers/OtherTWConfigurations.tid b/editions/tw5.com/tiddlers/OtherTWConfigurations.tid
index b0f4a0a97..b68087bc8 100644
--- a/editions/tw5.com/tiddlers/OtherTWConfigurations.tid
+++ b/editions/tw5.com/tiddlers/OtherTWConfigurations.tid
@@ -1,4 +1,5 @@
 title: Other TiddlyWiki configurations
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409081435
 modified: 201409081435
diff --git a/editions/tw5.com/tiddlers/TableOfContents.tid b/editions/tw5.com/tiddlers/TableOfContents.tid
index 99559b24d..8deaab317 100644
--- a/editions/tw5.com/tiddlers/TableOfContents.tid
+++ b/editions/tw5.com/tiddlers/TableOfContents.tid
@@ -24,9 +24,9 @@ $body$
 \end
 <div class="tc-table-of-contents">
 
-<div class='tw-table-of-contents'>
 <<toc-selective-expandable 'TableOfContents'>>
-</div>
+
+----
 
 ''Previous table of contents''
 
diff --git a/editions/tw5.com/tiddlers/about/Acknowledgements.tid b/editions/tw5.com/tiddlers/about/Acknowledgements.tid
index 34b154463..4eb766db5 100644
--- a/editions/tw5.com/tiddlers/about/Acknowledgements.tid
+++ b/editions/tw5.com/tiddlers/about/Acknowledgements.tid
@@ -4,6 +4,6 @@ tags: introduction
 title: Acknowledgements
 type: text/vnd.tiddlywiki
 
-TiddlyWiki wouldn't be possible without the ongoing support of the TiddlyWiki community. Their attention and feedback has made it possible to gain an understanding of what is wanted from the product, and their passion for it has taught me that it is worth the investment.
+TiddlyWiki wouldn't be possible without the ongoing support of the TiddlyWiki [[Community]]. Their attention and feedback has made it possible to gain an understanding of what is wanted from the product, and their passion for it has taught me that it is worth the investment.
 
 {{$:/Acknowledgements}}
diff --git a/editions/tw5.com/tiddlers/about/Documentation Style Guide.tid b/editions/tw5.com/tiddlers/about/Documentation Style Guide.tid
index c807c8917..4129f977b 100644
--- a/editions/tw5.com/tiddlers/about/Documentation Style Guide.tid	
+++ b/editions/tw5.com/tiddlers/about/Documentation Style Guide.tid	
@@ -8,3 +8,5 @@ The documentation for ~TiddlyWiki tries to follow the following guidelines. The
 # Do address the reader directly as "you"
 # Avoid the [[passive voice|http://grammar.ccc.commnet.edu/grammar/passive.htm]] in tutorial and introductory material
 # Do use [[British spellings in preference to US spellings|http://en.wikipedia.org/wiki/American_and_British_English_spelling_differences]]
+
+See also the guidelines for [[tiddler titles|Adopt a Titles Policy]].
diff --git a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid
new file mode 100644
index 000000000..ecbcea1e5
--- /dev/null
+++ b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid	
@@ -0,0 +1,34 @@
+title: History of TiddlyWiki
+tags: HelloThere
+created: 201409081144
+modified: 201409081144
+
+! Origins of TiddlyWiki
+
+Back in 1997 a colleague introduced me to [[Ward Cunningham's original wiki|http://c2.com/cgi/wiki]]. I was stunned that something so powerful could fit into just 700 lines of Perl, and fascinated by the radical reimagining of security and permissions. Like many other developers, I took every opportunity I could to try out various wikis, and to explore their use at work.
+
+The allure of the wiki for me was the feeling that this might be a paradigm that could eventually topple the prevailing hegemony of print-oriented documents and emails.
+
+After watching people use wikis for a few years, I noticed that power users made extensive use of the ability to open multiple wiki pages at once in several browser tabs, making it easier for them to compare and review pages, to copy text between them and to act as a sort of queue of pages yet to be read.
+
+I could see that this ability to manipulate multiple pages at once was central to the ability to refactor a wiki, and I've found that a wiki that is lovingly refactored tends to be more useful. And yet, standard wiki user interfaces have always been designed exclusively for the presentation and manipulation of single pages at once.
+
+All of these thoughts came together when I saw GMail in April 2004, which used Ajax cleverly to blend individual emails into threaded conversations.
+
+I started experimenting with HTML and JavaScript to explore the idea further. I'd had virtually no experience of either, just having put together some static pages and simple ASP sites in previous lives. Getting my head around these client-side technologies was painful; like everyone else, I was horrified to discover how appalling were the incompatibilities and inconsistencies of web programming.
+
+! Launch of TiddlyWiki
+
+So, in September 2004 I released a primitive [[first version of TiddlyWiki|http://tiddlywiki.com/firstversion.html]]. It was the smallest possible thing that demonstrated the idea that I had: it was a simple, self-contained static 48KB HTML file sitting on a dusty old Sun server in my friend Steph's attic.
+
+The downside of writing the first version of TiddlyWiki in this way was that it made it completely impractical to use for editing - when you click 'save changes' it just pops up a window showing the data that would be saved if it were possible for an HTML page to write to the file system.
+
+! Growth of TiddlyWiki
+
+! BT Acquisition
+
+! Osmosoft and TiddlySpace
+
+! Leaving BT
+
+//To be continued...//
diff --git a/editions/tw5.com/tiddlers/community/Articles.tid b/editions/tw5.com/tiddlers/community/Articles.tid
index 33272d76a..d3dd9084a 100644
--- a/editions/tw5.com/tiddlers/community/Articles.tid
+++ b/editions/tw5.com/tiddlers/community/Articles.tid
@@ -4,7 +4,7 @@ tags: [[Get help and learn more]]
 title: Articles about TiddlyWiki
 type: text/vnd.tiddlywiki
 
-Here are some articles written about ~TiddlyWiki. Submit new articles via GitHub, Twitter or by posting in the [[TiddlyWiki Groups]].
+Here are some recent articles written about ~TiddlyWiki. Submit new articles via GitHub, Twitter or by posting in the [[TiddlyWiki Groups]].
 
 <div class="tc-link-info">
 
diff --git a/editions/tw5.com/tiddlers/community/Contributing.tid b/editions/tw5.com/tiddlers/community/Contributing.tid
index 5f41e1d6d..535bc066b 100644
--- a/editions/tw5.com/tiddlers/community/Contributing.tid
+++ b/editions/tw5.com/tiddlers/community/Contributing.tid
@@ -1,6 +1,6 @@
 created: 20131101111400000
 modified: 20140607164329806
-tags: introduction
+tags: introduction [[Get involved]]
 title: Contributing
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/community/Create support resources.tid b/editions/tw5.com/tiddlers/community/Create support resources.tid
deleted file mode 100644
index dbd25b9c5..000000000
--- a/editions/tw5.com/tiddlers/community/Create support resources.tid	
+++ /dev/null
@@ -1,6 +0,0 @@
-title: Create support resources for TiddlyWiki
-tags: [[Get involved]]
-created: 201409081241
-modified: 201409081241
-
-forthcoming...
diff --git a/editions/tw5.com/tiddlers/community/Develop for TW.tid b/editions/tw5.com/tiddlers/community/Develop for TW.tid
deleted file mode 100644
index ff38dc737..000000000
--- a/editions/tw5.com/tiddlers/community/Develop for TW.tid	
+++ /dev/null
@@ -1,6 +0,0 @@
-title: Develop for TiddlyWiki
-tags: [[Get involved]]
-created: 201409081233
-modified: 201409081233
-
-Forthcoming...
diff --git a/editions/tw5.com/tiddlers/community/Examples.tid b/editions/tw5.com/tiddlers/community/Examples of TiddlyWiki in Use.tid
similarity index 92%
rename from editions/tw5.com/tiddlers/community/Examples.tid
rename to editions/tw5.com/tiddlers/community/Examples of TiddlyWiki in Use.tid
index 2587b7704..6a824506c 100644
--- a/editions/tw5.com/tiddlers/community/Examples.tid
+++ b/editions/tw5.com/tiddlers/community/Examples of TiddlyWiki in Use.tid	
@@ -1,7 +1,7 @@
 created: 20140320230543190
 modified: 20140320231444981
 tags: HelloThere [[Get help and learn more]]
-title: Examples of TiddlyWiki being used in the wild
+title: Examples of TiddlyWiki in Use
 type: text/vnd.tiddlywiki
 
 This collection showcases inspiring and interesting examples of TiddlyWiki being used in the wild.
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
index f55dd93f0..25923218f 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@@ -3,7 +3,7 @@ modified: 20140902124037214
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
-list: [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] [[Examples of TiddlyWiki being used in the wild]] [[The history of TiddlyWiki]] [[What happened to the other TiddlyWiki?]]
+list: [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] [[Examples of TiddlyWiki in Use]] [[History of TiddlyWiki]] [[What happened to the original TiddlyWiki?]]
 
 Welcome to ~TiddlyWiki, a versatile note-taking web application you can download for free, store wherever you like, customize however you wish, and use to take / organize / share your notes in ways that word processors and other note-taking tools cannot. ~TiddlyWiki is designed in a "non-linear" way, using tags, hyperlinks, and many other features, so that you can organize and retrieve your notes in ways that conform to your personal thought patterns, rather than feel chained to one pre-set organizational structure.
 
@@ -14,6 +14,6 @@ How can you make ~TiddlyWiki work for you? We recommend you start with our intro
 *[[Discover TiddlyWiki]]
 *[[Some of the things you can do with TiddlyWiki]]
 *[[Ten reasons to switch to TiddlyWiki]]
-*[[Examples of TiddlyWiki being used in the wild]]
-*[[The history of TiddlyWiki]] 
-*[[What happened to the other TiddlyWiki?]]
+*[[Examples of TiddlyWiki in Use]]
+*[[History of TiddlyWiki]] 
+*[[What happened to the original TiddlyWiki?]]
diff --git a/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid
new file mode 100644
index 000000000..144c5820d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid	
@@ -0,0 +1,14 @@
+title: What happened to the original TiddlyWiki?
+tags: HelloThere
+created: 201409040851
+modified: 201409040851
+
+<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank">[img width="200" [TiddlyWiki Classic.png]]</a>
+
+The original [[Classic|TiddlyWikiClassic]] version of TiddlyWiki is still available at:
+
+http://classic.tiddlywiki.com.
+
+Note that the [[current version|TiddlyWiki5]] of TiddlyWiki is not fully backwards compatible with TiddlyWikiClassic. Content can be imported but will need massaging to adapt to the new WikiText format. A ''tw2parser'' plugin is under development that will allow faithful display of most content created for TiddlyWikiClassic.
+
+<!-- TODO: Fill in a link to the tw2parser plugin -->
diff --git a/editions/tw5.com/tiddlers/advancedfeatures/Bookmarklets.tid b/editions/tw5.com/tiddlers/reference/Bookmarklets.tid
similarity index 61%
rename from editions/tw5.com/tiddlers/advancedfeatures/Bookmarklets.tid
rename to editions/tw5.com/tiddlers/reference/Bookmarklets.tid
index f16e22072..0439e7b1f 100644
--- a/editions/tw5.com/tiddlers/advancedfeatures/Bookmarklets.tid
+++ b/editions/tw5.com/tiddlers/reference/Bookmarklets.tid
@@ -1,4 +1,5 @@
 title: Bookmarklets
-tags: [[Advanced features]] tc-no-link
+tags: [[Advanced features]]
+toc-link: no
 created: 201409081415
 modified: 201409081415
diff --git a/editions/tw5.com/tiddlers/advancedfeatures/Editions.tid b/editions/tw5.com/tiddlers/reference/Editions.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/advancedfeatures/Editions.tid
rename to editions/tw5.com/tiddlers/reference/Editions.tid
diff --git a/editions/tw5.com/tiddlers/advancedfeatures/Filters.tid b/editions/tw5.com/tiddlers/reference/Filters.tid
similarity index 59%
rename from editions/tw5.com/tiddlers/advancedfeatures/Filters.tid
rename to editions/tw5.com/tiddlers/reference/Filters.tid
index d0253000e..d4c300b31 100644
--- a/editions/tw5.com/tiddlers/advancedfeatures/Filters.tid
+++ b/editions/tw5.com/tiddlers/reference/Filters.tid
@@ -1,4 +1,5 @@
 title: Filters
-tags: [[Advanced features]] tc-no-link
+tags: [[Advanced features]]
+toc-link: no
 created: 201409081307
 modified: 201409081307
diff --git a/editions/tw5.com/tiddlers/advancedfeatures/Widgets.tid b/editions/tw5.com/tiddlers/reference/Widgets.tid
similarity index 59%
rename from editions/tw5.com/tiddlers/advancedfeatures/Widgets.tid
rename to editions/tw5.com/tiddlers/reference/Widgets.tid
index 65aa13e63..857ccc7ac 100644
--- a/editions/tw5.com/tiddlers/advancedfeatures/Widgets.tid
+++ b/editions/tw5.com/tiddlers/reference/Widgets.tid
@@ -1,4 +1,5 @@
 title: Widgets
-tags: [[Advanced features]] tc-no-link
+tags: [[Advanced features]]
+toc-link: no
 created: 201409081305
 modified: 201409081305
diff --git a/editions/tw5.com/tiddlers/tocproject/Advanced features.tid b/editions/tw5.com/tiddlers/tocproject/Advanced features.tid
index c0a1fb1f3..2c26420f8 100644
--- a/editions/tw5.com/tiddlers/tocproject/Advanced features.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/Advanced features.tid	
@@ -1,5 +1,6 @@
 title: Advanced features
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409041030
 modified: 201409041030
 
diff --git a/editions/tw5.com/tiddlers/tocproject/Customise TiddlyWiki.tid b/editions/tw5.com/tiddlers/tocproject/Customise TiddlyWiki.tid
index 1fc4bfc71..d34ee7dd6 100644
--- a/editions/tw5.com/tiddlers/tocproject/Customise TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/Customise TiddlyWiki.tid	
@@ -1,5 +1,6 @@
 title: Customise TiddlyWiki
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409041016
 modified: 201409041016
 list: [[Initial customisation]]
diff --git a/editions/tw5.com/tiddlers/tocproject/Get help and learn more.tid b/editions/tw5.com/tiddlers/tocproject/Get help and learn more.tid
index a1e3cefad..1a61131ea 100644
--- a/editions/tw5.com/tiddlers/tocproject/Get help and learn more.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/Get help and learn more.tid	
@@ -1,5 +1,6 @@
 title: Get help and learn more
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409041022
 modified: 201409041022
 
diff --git a/editions/tw5.com/tiddlers/tocproject/Get involved.tid b/editions/tw5.com/tiddlers/tocproject/Get involved.tid
index 60714d778..eb4b04a80 100644
--- a/editions/tw5.com/tiddlers/tocproject/Get involved.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/Get involved.tid	
@@ -1,5 +1,6 @@
 title: Get involved
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409041026
 modified: 201409041026
 
diff --git a/editions/tw5.com/tiddlers/tocproject/Other TiddlyWiki configurations.tid b/editions/tw5.com/tiddlers/tocproject/Other TiddlyWiki configurations.tid
index 59cb391e8..c2ce1cf48 100644
--- a/editions/tw5.com/tiddlers/tocproject/Other TiddlyWiki configurations.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/Other TiddlyWiki configurations.tid	
@@ -1,5 +1,6 @@
 title: Other TiddlyWiki configurations
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409041019
 modified: 201409041019
 
diff --git a/editions/tw5.com/tiddlers/tocproject/TiddlyWiki glossaries.tid b/editions/tw5.com/tiddlers/tocproject/TiddlyWiki glossaries.tid
index 92a86b34f..4c655b005 100644
--- a/editions/tw5.com/tiddlers/tocproject/TiddlyWiki glossaries.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/TiddlyWiki glossaries.tid	
@@ -1,4 +1,5 @@
 title: TiddlyWiki glossaries
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409081158
 modified: 201409081158
diff --git a/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid b/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid
index 5507a0055..282288a19 100644
--- a/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid	
@@ -1,5 +1,6 @@
 title: Working with TiddlyWiki
-tags: TableOfContents tc-no-link
+tags: TableOfContents
+toc-link: no
 created: 201409041011
 modified: 201409041011
 list: [[Downloading and saving]] [[The First Rule of Using TiddlyWiki]] [[Initial customisation]] [[Creating, tagging and editing tiddlers]] [[Navigating between open tiddlers]] [[Using links to navigate between tiddlers]] [[Formatting text in TiddlyWiki]] [[Searching in TiddlyWiki]] [[Images in TiddlyWiki]] [[Creating tabs]] [[Using tiddler fields]] [[Sharing tiddlers with others]] [[Hosting your TiddlyWiki on the web]] [[Importing tiddlers between TW files]] [[Upgrading TiddlyWiki]]
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid b/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid
index d02d7fae5..e9229e41a 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid	
@@ -1,4 +1,5 @@
 title: Formatting text in TiddlyWiki
-tags: [[Working with TiddlyWiki]] tc-no-link
+tags: [[Working with TiddlyWiki]]
+toc-link: no
 created: 201409081315
 modified: 201409081315