diff --git a/core/language/en-GB/Help/rendertiddlers.tid b/core/language/en-GB/Help/rendertiddlers.tid
index a0e76d147..bb7b88423 100644
--- a/core/language/en-GB/Help/rendertiddlers.tid
+++ b/core/language/en-GB/Help/rendertiddlers.tid
@@ -6,13 +6,13 @@ description: Render tiddlers matching a filter to a specified ContentType
 Render a set of tiddlers matching a filter to separate files of a specified ContentType (defaults to `text/html`) and extension (defaults to `.html`).
 
 ```
---rendertiddlers <filter> <template> <pathname> [<type>] [<extension>] ["noclean"]
+--rendertiddlers '<filter>' <template> <pathname> [<type>] [<extension>] ["noclean"]
 ```
 
 For example:
 
 ```
---rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
+--rendertiddlers '[!is[system]]' $:/core/templates/static.tiddler.html ./static text/plain
 ```
 
 By default, the pathname is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory.
diff --git a/editions/prerelease/tiddlers/afc/MySpecialTag.tid b/editions/prerelease/tiddlers/afc/MySpecialTag.tid
new file mode 100644
index 000000000..aced260a9
--- /dev/null
+++ b/editions/prerelease/tiddlers/afc/MySpecialTag.tid
@@ -0,0 +1,5 @@
+title: MySpecialTag
+show-navigation: yes
+description: this is a really special tag!
+
+And this is lots more information about it
diff --git a/editions/prerelease/tiddlers/afc/TagNavigation.tid b/editions/prerelease/tiddlers/afc/TagNavigation.tid
new file mode 100644
index 000000000..559c32b82
--- /dev/null
+++ b/editions/prerelease/tiddlers/afc/TagNavigation.tid
@@ -0,0 +1,26 @@
+title: $:/_AFC/TagNavigation
+tags: $:/tags/ViewTemplate
+list-after: $:/core/ui/ViewTemplate/body
+
+<div class="tc-tag-nav-slice">
+
+<$list filter="[all[current]tags[]sort[]show-navigation[yes]]" variable="tag">
+
+<div class="tc-tag-nav-wrapper">
+<$button class="tc-tag-nav-button tc-tag-nav-button-previous">
+<$action-navigate $to={{{ [<tag>tagging[]before<currentTiddler>last[]] }}}/>
+{{$:/core/images/chevron-left}} previous
+</$button>
+<$button class="tc-tag-nav-button tc-tag-nav-button-middle tc-btn-invisible">
+<$action-navigate $to=<<tag>>/>
+<$text text=<<tag>>/>: <$text text={{{ [<tag>get[description]] }}}/>
+</$button>
+<$button class="tc-tag-nav-button tc-tag-nav-button-next">
+<$action-navigate $to={{{ [<tag>tagging[]after<currentTiddler>] }}}/>
+next {{$:/core/images/chevron-right}}
+</$button>
+</div>
+
+</$list>
+
+</div>
\ No newline at end of file
diff --git a/editions/prerelease/tiddlers/afc/TagNavigationStyles.tid b/editions/prerelease/tiddlers/afc/TagNavigationStyles.tid
new file mode 100644
index 000000000..edc19dbd4
--- /dev/null
+++ b/editions/prerelease/tiddlers/afc/TagNavigationStyles.tid
@@ -0,0 +1,23 @@
+title: $:/_AFC/TagNavigationStyles
+tags: $:/tags/Stylesheet
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
+
+.tc-tag-nav-wrapper {
+	clear: both;
+	display: flex;
+}
+
+.tc-tag-nav-button-previous,
+.tc-tag-nav-button-next {
+	cursor: pointer;
+	font-size: 2em;
+	border: none;
+	background: #ddf;
+	border-radius: 4px;
+	padding: 5px;
+}
+
+.tc-tag-nav-button-middle {
+	flex: 1;
+}
diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info
deleted file mode 100644
index 5c56d6a8a..000000000
--- a/editions/server/tiddlywiki.info
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"description": "Basic client-server edition",
-	"plugins": [
-		"tiddlywiki/tiddlyweb",
-		"tiddlywiki/filesystem",
-		"tiddlywiki/highlight"
-	],
-	"themes": [
-		"tiddlywiki/vanilla",
-		"tiddlywiki/snowwhite"
-	],
-	"build": {
-		"index": [
-			"--rendertiddler","$:/plugins/tiddlywiki/tiddlyweb/save/offline","index.html","text/plain"],
-		"static": [
-			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
-			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
-	}
-}
diff --git a/editions/share/tiddlywiki.info b/editions/share/tiddlywiki.info
deleted file mode 100644
index 56c0ee84b..000000000
--- a/editions/share/tiddlywiki.info
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"description": "Sharing tiddlers via URLs",
-	"plugins": [
-		"tiddlywiki/share"
-	],
-	"themes": [
-		"tiddlywiki/vanilla",
-		"tiddlywiki/snowwhite"
-	],
-	"build": {
-		"share": [
-			"--rendertiddler","$:/core/save/all","share.html","text/plain"]
-	}
-}
diff --git a/editions/tw5.com/tiddlers/$__StoryList.tid b/editions/tw5.com/tiddlers/$__StoryList.tid
deleted file mode 100644
index 80d265c4e..000000000
--- a/editions/tw5.com/tiddlers/$__StoryList.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-created: 20191004112211823
-list: [[WidgetMessage: tm-unload-plugin-library]] [[WidgetMessage: tm-load-plugin-library]] [[WidgetMessage: tm-load-plugin-from-library]] HelloThere GettingStarted Community
-modified: 20191004113621710
-title: $:/StoryList
-type: text/vnd.tiddlywiki
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/filters/Introduction to filter notation.tid b/editions/tw5.com/tiddlers/filters/Introduction to filter notation.tid
index e6b785a18..9a23eb84b 100644
--- a/editions/tw5.com/tiddlers/filters/Introduction to filter notation.tid	
+++ b/editions/tw5.com/tiddlers/filters/Introduction to filter notation.tid	
@@ -72,13 +72,13 @@ In a similar way, we can use a `-` sign to <<.em remove>> a run's tiddlers from
 
 !Special parameters
 
-The parameter of each step we've seen so far has been in square brackets, meaning that ~TiddlyWiki treats it literally. But two other kinds of bracket are possible:
+The parameter of each step we've seen so far has been in square brackets. It means that ~TiddlyWiki will filter for the exact string found between the brackets. But two other kinds of bracket are possible:
 
-<<.def "Curly brackets">> `{}` mean that the parameter is a TextReference, and that its value is to be looked up in a specified tiddler. For example, if we have a tiddler called <<.tid Preference>> whose text happens to be the word <<.value Vegetarian>>, we can say
+<<.def "Curly brackets">> `{}` mean that the parameter is a TextReference, and it will be replaced with content from another tiddler. For example, if we have a tiddler with the title <<.tid Preference>> whose content is the single word <<.value Vegetarian>>, we can say
 
 > `[tag{Preference}]`
 
-as an alternative to `[tag[Vegetarian]]`. This allows the preference to change over time.
+In this simplest form the TextReference will take the full content of the tiddler (in technical terms, the text field of the tiddler) and substitute it in place of the TextReference. This way the tiddler's content will become the filter parameter, just like if you have written `[tag[Vegetarian]]`. But it gives you the added flexibility to change the parameter by changing the content of the Preference tiddler.
 
 <<.def "Angle brackets">> `<>` mean that the parameter is the name of a [[variable|Variables]] whose value is to be used instead. Here we use the built-in <<.vlink currentTiddler>> variable in a filter that selects any tiddlers whose text contains the title of the current one:
 
diff --git a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid
index e9da4ae08..ce1061431 100644
--- a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid	
@@ -17,7 +17,7 @@ You can explore a static representation of the main TiddlyWiki site at https://t
 The following commands are used to generate the sample static version of the TiddlyWiki5 site:
 
 ```
-tiddlywiki wikipath --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html static text/plain
+tiddlywiki wikipath --rendertiddlers '[!is[system]]' $:/core/templates/static.tiddler.html static text/plain
 tiddlywiki wikipath --rendertiddler $:/core/templates/static.template.html static.html text/plain
 tiddlywiki wikipath --rendertiddler $:/core/templates/static.template.css static/static.css text/plain
 ```
diff --git a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid
index 6765c0461..707ed3a0b 100644
--- a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid
+++ b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid
@@ -1,17 +1,10 @@
 created: 20130823203800000
-modified: 20160418123722695
+modified: 2020051619421803
 tags: About
 title: RoadMap
 type: text/vnd.tiddlywiki
 
-There are still some areas of TiddlyWiki that have not been fully developed beyond the experimental stage:
+TiddlyWiki 5 is now a mature, stable project that is relied upon by many people. Simultaneously, it is rapidly evolving in many directions thanks to the broad community of developers and users. This paradoxical situation is possible because the project strictly maintains backwards compatibility, adding new features alongside the existing ones.
 
-* Multiple users with the client-server configuration
-* Smartphone user experience
-* New tiddler manager, including bulk operations like search and replace
-* Federation that can run in the browser or under Node.js
-* Improved editions
-* Improved support for third party plugin libraries
-
-Also see the issues list on GitHub: https://github.com/Jermolene/TiddlyWiki5
+There is no formal roadmap, but quite a few areas that have yet to be fully implemented, such as search and replace, and rich text editing. Current work can be found on ~GitHub at https://github.com/Jermolene/TiddlyWiki5/