diff --git a/editions/tw5.com/tiddlers/commands/BuildCommand.tid b/editions/tw5.com/tiddlers/commands/BuildCommand.tid
index 10cbe2be2..62eb32faf 100644
--- a/editions/tw5.com/tiddlers/commands/BuildCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/BuildCommand.tid
@@ -1,8 +1,9 @@
 created: 20140425085548209
 modified: 20140427210435569
-tags: command
+tags: Commands
 title: BuildCommand
 type: text/vnd.tiddlywiki
+caption: build
 
 {{$:/language/Help/build}}
 
diff --git a/editions/tw5.com/tiddlers/commands/ClearPasswordCommand.tid b/editions/tw5.com/tiddlers/commands/ClearPasswordCommand.tid
index fc07c4866..ed2d9c573 100644
--- a/editions/tw5.com/tiddlers/commands/ClearPasswordCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/ClearPasswordCommand.tid
@@ -1,4 +1,5 @@
 title: ClearPasswordCommand
-tags: command
+tags: Commands
+caption: clearpassword
 
 {{$:/language/Help/clearpassword}}
diff --git a/editions/tw5.com/tiddlers/commands/Commands.tid b/editions/tw5.com/tiddlers/commands/Commands.tid
new file mode 100644
index 000000000..3243d5d22
--- /dev/null
+++ b/editions/tw5.com/tiddlers/commands/Commands.tid
@@ -0,0 +1,4 @@
+title: Commands
+tags: Reference
+
+Commands are used with [[TiddlyWiki on Node.js|Using TiddlyWiki on Node.js]].
diff --git a/editions/tw5.com/tiddlers/commands/HelpCommand.tid b/editions/tw5.com/tiddlers/commands/HelpCommand.tid
index 7a74824ea..ca802d6e9 100644
--- a/editions/tw5.com/tiddlers/commands/HelpCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/HelpCommand.tid
@@ -1,7 +1,8 @@
 created: 20140225195548209
 modified: 20140225195738745
-tags: command
+tags: Commands
 title: HelpCommand
 type: text/vnd.tiddlywiki
+caption: help
 
 {{$:/language/Help/help}}
diff --git a/editions/tw5.com/tiddlers/commands/InitCommand.tid b/editions/tw5.com/tiddlers/commands/InitCommand.tid
index 8a3f8bbdb..449cc7d90 100644
--- a/editions/tw5.com/tiddlers/commands/InitCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/InitCommand.tid
@@ -1,8 +1,9 @@
 created: 20140223195548209
 modified: 20140617212529392
-tags: command
+tags: Commands
 title: InitCommand
 type: text/vnd.tiddlywiki
+caption: init
 
 {{$:/language/Help/init}}
 
diff --git a/editions/tw5.com/tiddlers/commands/LoadCommand.tid b/editions/tw5.com/tiddlers/commands/LoadCommand.tid
index f62ce9b37..634060625 100644
--- a/editions/tw5.com/tiddlers/commands/LoadCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/LoadCommand.tid
@@ -1,7 +1,8 @@
 created: 20140119201439976
 modified: 20140119201554602
-tags: command
+tags: Commands
 title: LoadCommand
 type: text/vnd.tiddlywiki
+caption: load
 
 {{$:/language/Help/load}}
diff --git a/editions/tw5.com/tiddlers/commands/MakeLibraryCommand.tid b/editions/tw5.com/tiddlers/commands/MakeLibraryCommand.tid
index 627b4ee67..f4223b7ea 100644
--- a/editions/tw5.com/tiddlers/commands/MakeLibraryCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/MakeLibraryCommand.tid
@@ -1,8 +1,9 @@
 created: 20140903085210479
 modified: 20140903085210479
-tags: command
+tags: Commands
 title: MakeLibraryCommand
 type: text/vnd.tiddlywiki
+caption: makelibrary
 
 {{$:/language/Help/makelibrary}}
 
diff --git a/editions/tw5.com/tiddlers/commands/OutputCommand.tid b/editions/tw5.com/tiddlers/commands/OutputCommand.tid
index 2744f8c68..522174120 100644
--- a/editions/tw5.com/tiddlers/commands/OutputCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/OutputCommand.tid
@@ -1,7 +1,8 @@
 created: 20140425085548209
 modified: 20140425085738745
-tags: command
+tags: Commands
 title: OutputCommand
 type: text/vnd.tiddlywiki
+caption: output
 
 {{$:/language/Help/output}}
diff --git a/editions/tw5.com/tiddlers/commands/PasswordCommand.tid b/editions/tw5.com/tiddlers/commands/PasswordCommand.tid
index 909db11fe..fbd57c929 100644
--- a/editions/tw5.com/tiddlers/commands/PasswordCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/PasswordCommand.tid
@@ -1,4 +1,5 @@
 title: PasswordCommand
-tags: command
+tags: Commands
+caption: password
 
 {{$:/language/Help/password}}
diff --git a/editions/tw5.com/tiddlers/commands/RenderTiddlerCommand.tid b/editions/tw5.com/tiddlers/commands/RenderTiddlerCommand.tid
index eea70700f..7e535648d 100644
--- a/editions/tw5.com/tiddlers/commands/RenderTiddlerCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/RenderTiddlerCommand.tid
@@ -1,4 +1,5 @@
 title: RenderTiddlerCommand
-tags: command
+tags: Commands
+caption: rendertiddler
 
 {{$:/language/Help/rendertiddler}}
diff --git a/editions/tw5.com/tiddlers/commands/RenderTiddlersCommand.tid b/editions/tw5.com/tiddlers/commands/RenderTiddlersCommand.tid
index 83b7f2ade..d2b62fb99 100644
--- a/editions/tw5.com/tiddlers/commands/RenderTiddlersCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/RenderTiddlersCommand.tid
@@ -1,4 +1,5 @@
 title: RenderTiddlersCommand
-tags: command
+tags: Commands
+caption: rendertiddlers
 
 {{$:/language/Help/rendertiddlers}}
diff --git a/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid b/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid
index b35a8c8e9..3f4626a5b 100644
--- a/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid
@@ -1,6 +1,7 @@
 title: SaveTiddlerCommand
-tags: command
+tags: Commands
 created: 20131218121606089
 modified: 20131218121606089
+caption: savetiddler
 
 {{$:/language/Help/savetiddler}}
diff --git a/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid b/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid
index 6fa21bd69..5ca877bfa 100644
--- a/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid
@@ -1,6 +1,7 @@
 title: SaveTiddlersCommand
-tags: command
+tags: Commands
 created: 20140609121606089
 modified: 20140609121606089
+caption: savetiddlers
 
 {{$:/language/Help/savetiddlers}}
diff --git a/editions/tw5.com/tiddlers/commands/ServerCommand.tid b/editions/tw5.com/tiddlers/commands/ServerCommand.tid
index 8b0659c3d..c21a8a430 100644
--- a/editions/tw5.com/tiddlers/commands/ServerCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/ServerCommand.tid
@@ -1,7 +1,8 @@
 created: 20131219163923630
 modified: 20131229130513478
-tags: command
+tags: Commands
 title: ServerCommand
 type: text/vnd.tiddlywiki
+caption: server
 
 {{$:/language/Help/server}}
diff --git a/editions/tw5.com/tiddlers/commands/SetFieldCommand.tid b/editions/tw5.com/tiddlers/commands/SetFieldCommand.tid
index ae1ef61f6..6730a762d 100644
--- a/editions/tw5.com/tiddlers/commands/SetFieldCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/SetFieldCommand.tid
@@ -1,6 +1,7 @@
 title: SetFieldCommand
-tags: command
+tags: Commands
 created: 20140609121606089
 modified: 20140609121606089
+caption: setfield
 
 {{$:/language/Help/setfield}}
diff --git a/editions/tw5.com/tiddlers/commands/VerboseCommand.tid b/editions/tw5.com/tiddlers/commands/VerboseCommand.tid
index 51aa60625..e27258473 100644
--- a/editions/tw5.com/tiddlers/commands/VerboseCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/VerboseCommand.tid
@@ -1,4 +1,5 @@
 title: VerboseCommand
-tags: command
+tags: Commands
+caption: verbose
 
 {{$:/language/Help/verbose}}
diff --git a/editions/tw5.com/tiddlers/commands/VersionCommand.tid b/editions/tw5.com/tiddlers/commands/VersionCommand.tid
index 37efdf778..07a54fb0d 100644
--- a/editions/tw5.com/tiddlers/commands/VersionCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/VersionCommand.tid
@@ -1,4 +1,5 @@
 title: VersionCommand
-tags: command
+tags: Commands
+caption: version
 
 {{$:/language/Help/version}}
diff --git a/editions/tw5.com/tiddlers/concepts/Plugins.tid b/editions/tw5.com/tiddlers/concepts/Plugins.tid
index 0e50b48b8..f44ebe69c 100644
--- a/editions/tw5.com/tiddlers/concepts/Plugins.tid
+++ b/editions/tw5.com/tiddlers/concepts/Plugins.tid
@@ -1,6 +1,6 @@
 created: 20140910215514237
 modified: 20140910215514237
-tags: concepts Reference
+tags: concepts
 title: Plugins
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/concepts/WidgetMessages.tid b/editions/tw5.com/tiddlers/concepts/WidgetMessages.tid
index 5addc5246..60f035817 100644
--- a/editions/tw5.com/tiddlers/concepts/WidgetMessages.tid
+++ b/editions/tw5.com/tiddlers/concepts/WidgetMessages.tid
@@ -1,6 +1,6 @@
 created: 20140226083311937
 modified: 20140226090209479
-tags: concepts
+tags: concepts Reference
 title: WidgetMessages
 type: text/vnd.tiddlywiki
 
@@ -9,7 +9,7 @@ Widget messages are generated by widgets in response to user actions. They flow
 The following widget messages are implemented by the core:
 
 <ul>
-<$list filter="[tag[message]]">
+<$list filter="[tag[WidgetMessages]]">
 <li>
 <$link to={{!!title}}>
 <$view field="title"/>
diff --git a/editions/tw5.com/tiddlers/filters/FilterOperators.tid b/editions/tw5.com/tiddlers/filters/FilterOperators.tid
index 580cfab1a..9530214f3 100644
--- a/editions/tw5.com/tiddlers/filters/FilterOperators.tid
+++ b/editions/tw5.com/tiddlers/filters/FilterOperators.tid
@@ -7,6 +7,8 @@ type: text/vnd.tiddlywiki
 \define bulletList(filter)
 <ul><$list filter="$filter$"><li><$link to={{!!title}}><$view field="title"/></$link></li></$list></ul>
 \end
+Filter operators are the individual elements of [[filters|Filters]]. See [[Introduction to Filters]] for details.
+
 The full list of available filter operators is:
 
-<<bulletList "[tag[filters]]">>
+<<bulletList "[tag[Filters]]">>
diff --git a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
index 30a8368ee..4f6c50c94 100644
--- a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid
@@ -3,6 +3,7 @@ modified: 20131228163922307
 tags: Macros
 title: ChangeCountMacro
 type: text/vnd.tiddlywiki
+caption: changecount
 
 The changecount macro returns a counter maintained by the TiddlyWiki core that tracks the number of modifications made to each tiddler. The changecount macro always applies to the tiddler named in the [[currentTiddler|WidgetVariable: currentTiddler]] variable.
 
diff --git a/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid b/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
index 2e09c1e3e..c83f67068 100644
--- a/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
@@ -3,6 +3,7 @@ modified: 20140908104107181
 tags: Macros
 title: DumpVariablesMacro
 type: text/vnd.tiddlywiki
+caption: dumpvariables
 
 The dumpvariables macro displays a table containing the values of all the variables defined at that location in the widget tree. It can be useful for exploring the mechanisms of TiddlyWiki and for debugging.
 
diff --git a/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid b/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid
index fedff5394..7bb768338 100644
--- a/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/MakeDataUriMacro.tid
@@ -3,6 +3,7 @@ modified: 20131228163843163
 tags: Macros
 title: MakeDataUriMacro
 type: text/vnd.tiddlywiki
+caption: makedatauri
 
 The makedatauri macro constructs a data URI from a block of text and an associated ContentType. It is commonly used within stylesheets to generate an inline image or font.
 
diff --git a/editions/tw5.com/tiddlers/macros/QualifyMacro.tid b/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
index 5254f83ea..d533a013d 100644
--- a/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
@@ -3,6 +3,7 @@ modified: 20131228164955084
 tags: Macros
 title: QualifyMacro
 type: text/vnd.tiddlywiki
+caption: qualify
 
 The qualify macro is part of the StateMechanism. Given a base tiddler title it generates a unique string that includes a hashed encoding of a position within the widget render tree, identified by the stack of transcluded tiddlers that leads to that position.
 
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
index bb0879441..17c6583a4 100644
--- a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
@@ -1,6 +1,7 @@
 title: TableOfContentsMacro
 tags: Macros
 modified: 20140905084423561
+caption: toc
 
 The table of contents macro produces a hierarchical tree of tiddlers based on their tags.
 
diff --git a/editions/tw5.com/tiddlers/macros/TabsMacro.tid b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
index 796fd9ce2..5c2c46f45 100644
--- a/editions/tw5.com/tiddlers/macros/TabsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
@@ -3,6 +3,7 @@ modified: 20140702113527667
 tags: Macros
 title: TabsMacro
 type: text/vnd.tiddlywiki
+caption: tabs
 
 The tabs macro displays a list of tiddlers as a tab control. The user can switch between tabs by clicking on them. The tabs are labelled with the title of the corresponding tiddler, unless there is a `caption` field present in which case it is used instead.
 
diff --git a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
index 6435cad71..0d2866257 100644
--- a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
@@ -1,6 +1,7 @@
 title: TimelineMacro
 tags: Macros
 modified: 20140905084423561
+caption: timeline
 
 The timeline macro produces a list of tiddlers in reverse chronological order of modification date that is grouped by the date of the day of modification.
 
diff --git a/editions/tw5.com/tiddlers/macros/VersionMacro.tid b/editions/tw5.com/tiddlers/macros/VersionMacro.tid
index 16e32ea7c..a4c69fe13 100644
--- a/editions/tw5.com/tiddlers/macros/VersionMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/VersionMacro.tid
@@ -3,6 +3,7 @@ modified: 20131228162605081
 tags: Macros
 title: VersionMacro
 type: text/vnd.tiddlywiki
+caption: version
 
 The version macro returns the current TiddlyWiki version number.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid
index 40e222647..594128818 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid	
@@ -1,8 +1,9 @@
 created: 20140908185153663
 modified: 20140908185153663
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-add-field
 type: text/vnd.tiddlywiki
+caption: tm-add-field
 
 The `tm-add-field` message is handled by the FieldMangerWidget. It adds the specified field with a blank value if the field doesn't already exist.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-tag.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-tag.tid
index a295f6a9a..6156fb2e1 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-tag.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-tag.tid	
@@ -1,8 +1,9 @@
 created: 20140908185153663
 modified: 20140908185153663
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-add-tag
 type: text/vnd.tiddlywiki
+caption: tm-add-tag
 
 The `tm-add-tag` message is handled by the FieldMangerWidget. It adds the specified tag.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-auto-save-wiki.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-auto-save-wiki.tid
index 1d21af34d..b4a810b10 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-auto-save-wiki.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-auto-save-wiki.tid	
@@ -1,8 +1,9 @@
 created: 20140830112325641
 modified: 20140830115149288
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-auto-save-wiki
 type: text/vnd.tiddlywiki
+caption: tm-auto-save-wiki
 
 The autosave wiki message causes the current saver module to perform a background save if it is required.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-browser-refresh.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-browser-refresh.tid
index c9b7e8d2d..71aff70d1 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-browser-refresh.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-browser-refresh.tid	
@@ -1,8 +1,9 @@
 created: 20140819110529062
 modified: 20140826110529062
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-browser-refresh
 type: text/vnd.tiddlywiki
+caption: tm-browser-refresh
 
 The `tm-browser-refresh` message refreshes the page, causing the re-initialisation of any plugin tiddlers. It does not require any properties on the `event` object.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-cancel-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-cancel-tiddler.tid
index 993071242..c2ee87382 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-cancel-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-cancel-tiddler.tid	
@@ -1,8 +1,9 @@
 created: 20140226193622350
 modified: 20140226193906089
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-cancel-tiddler
 type: text/vnd.tiddlywiki
+caption: tm-cancel-tiddler
 
 The `tm-cancel-tiddler` message abandons the changes in a draft tiddler. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-clear-password.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-clear-password.tid
index b8de1c9e0..fda046d42 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-clear-password.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-clear-password.tid	
@@ -1,8 +1,9 @@
 created: 20140226084018038
 modified: 20140226084916556
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-clear-password
 type: text/vnd.tiddlywiki
+caption: tm-clear-password
 
 The `tm-clear-password` message clears the current password from the password vault, clearing the [[$:/isEncrypted]] tiddler. See EncryptionMechanism for details.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-tiddlers.tid
index 67e9834f1..0196ce2b7 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-tiddlers.tid	
@@ -1,8 +1,9 @@
 created: 20140226194242809
 modified: 20140226194341303
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-close-all-tiddlers
 type: text/vnd.tiddlywiki
+caption: tm-close-all-tiddlers
 
 The close all tiddlers message empties the story list.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-other-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-other-tiddlers.tid
index eb5197e98..dba1d3112 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-other-tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-other-tiddlers.tid	
@@ -1,8 +1,9 @@
 created: 20140302183306544
 modified: 20140302183352966
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-close-other-tiddlers
 type: text/vnd.tiddlywiki
+caption: tm-close-other-tiddlers
 
 The `tm-close-other-tiddlers` message removes all but a specified tiddler from the story list. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-tiddler.tid
index 527c7c659..754a31a86 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-tiddler.tid	
@@ -1,8 +1,9 @@
 created: 20140226193940778
 modified: 20140226194227227
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-close-tiddler
 type: text/vnd.tiddlywiki
+caption: tm-close-tiddler
 
 The `tm-close-tiddler` message removes a specified tiddler from the story list. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-delete-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-delete-tiddler.tid
index 5187a7848..a33c58449 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-delete-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-delete-tiddler.tid	
@@ -1,8 +1,9 @@
 created: 20140226090324129
 modified: 20140226090441236
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-delete-tiddler
 type: text/vnd.tiddlywiki
+caption: tm-delete-tiddler
 
 The `tm-delete-tiddler` message deletes the specified tiddler and removes it from the current story. If the tiddler is a draft then it also deletes the tiddler specified in the `draft.of` field. The delete tiddler message requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-download-file.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-download-file.tid
index f49554998..96115c49e 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-download-file.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-download-file.tid	
@@ -1,8 +1,9 @@
 created: 20140811112201235
 modified: 20140811115140378
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-download-file
 type: text/vnd.tiddlywiki
+caption: tm-download-file
 
 The download file message causes the current saver module to prompt the user to download the result of parsing a specified template tiddler as a file. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-tiddler.tid
index fa364c940..1dc12d383 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-tiddler.tid	
@@ -1,8 +1,9 @@
 created: 20140226085529797
 modified: 20140226090641987
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-edit-tiddler
 type: text/vnd.tiddlywiki
+caption: tm-edit-tiddler
 
 The `tm-edit-tiddler` message replaces the specified tiddler in the current story with a draft version of itself. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-full-screen.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-full-screen.tid
index 6ab0784ac..f5f5bfba9 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-full-screen.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-full-screen.tid	
@@ -1,8 +1,9 @@
 created: 20140811112400855
 modified: 20140811113627373
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-full-screen
 type: text/vnd.tiddlywiki
+caption: tm-full-screen
 
 The fullscreen message toggles the "fullscreen" mode of the browser, if it supports it.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-home.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-home.tid
index 970effcf6..5caa78fe7 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-home.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-home.tid	
@@ -1,8 +1,9 @@
 created: 20140819110529062
 modified: 20140819110529062
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-home
 type: text/vnd.tiddlywiki
+caption: tm-home
 
 The `tm-home` message closes any open tiddlers and re-opens the default tiddlers set in [[$:/DefaultTiddlers]]. It also remove any [[permalink|PermaLinks]] from the browser address bar. It does not require any properties on the `event` object.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-import-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-import-tiddlers.tid
index eef04b37a..cc6d69388 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-import-tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-import-tiddlers.tid	
@@ -1,8 +1,9 @@
 created: 20140716084658099
 modified: 20140716195055502
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-import-tiddlers
 type: text/vnd.tiddlywiki
+caption: tm-import-tiddlers
 
 The `tm-import-tiddlers` message inserts a list of tiddlers into the pending import tiddler [[$:/Import]]. It also applies any active ''upgrader'' modules to each tiddler as it arrives (see the UpgradeMechanism for more details).
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-login.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-login.tid
index 29397abef..019bc1247 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-login.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-login.tid	
@@ -1,8 +1,9 @@
 created: 20140811112445887
 modified: 20140811113336694
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-login
 type: text/vnd.tiddlywiki
+caption: tm-login
 
 The login message prompts the user for a username and password and attempts to login to the current serverside host. The tiddler [[$:/status/IsLoggedIn]] reflects the current login status with the values "yes" or "no", and [[$:/status/UserName]] reflects the current username.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-logout.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-logout.tid
index bc4a57921..c40d9b615 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-logout.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-logout.tid	
@@ -1,8 +1,9 @@
 created: 20140811112457311
 modified: 20140811113344084
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-logout
 type: text/vnd.tiddlywiki
+caption: tm-logout
 
 The logout message attempts to log the user out of the current serverside host. The tiddler [[$:/status/IsLoggedIn]] reflects the current login status with the values "yes" or "no", and [[$:/status/UserName]] reflects the current username.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid
index 89178e686..d05973c1e 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid	
@@ -1,8 +1,9 @@
 created: 20140811112133701
 modified: 20140811120203685
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-modal
 type: text/vnd.tiddlywiki
+caption: tm-modal
 
 The modal message displays a specified tiddler in a modal overlay that dims the main page. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-navigate.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-navigate.tid
index 298d4694a..aacad39c1 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-navigate.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-navigate.tid	
@@ -1,8 +1,9 @@
 created: 20140226085215941
 modified: 20140226085454346
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-navigate
 type: text/vnd.tiddlywiki
+caption: tm-navigate
 
 The `tm-navigate` message inserts the specified tiddler into the story and puts it at the top of the history stack. If the tiddler is not already present in the story then it will be positioned immediately after the tiddler specified in `event.navigateFromTitle`.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid
index 23d3413ae..5af7b172a 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid	
@@ -1,8 +1,9 @@
 created: 20140226194405353
 modified: 20140724194729158
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-new-tiddler
 type: text/vnd.tiddlywiki
+caption: tm-new-tiddler
 
 The new tiddler message creates a new draft tiddler and adds it to the current story. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid
index 38c86d253..a02d3162f 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid	
@@ -1,8 +1,9 @@
 created: 20140811112304772
 modified: 20140811120248738
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-notify
 type: text/vnd.tiddlywiki
+caption: tm-notify
 
 The notify message briefly displays a specified tiddler as a small alert in the upper right corner of the page. It requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-perform-import.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-perform-import.tid
index 6bc6159ff..bc046baac 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-perform-import.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-perform-import.tid	
@@ -1,8 +1,9 @@
 created: 20140716084242809
 modified: 20140716084341303
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-perform-import
 type: text/vnd.tiddlywiki
+caption: tm-perform-import
 
 The perform import message copies tiddlers from a specified plugin into the main store. See the UpgradeMechanism for an overview of how it is used by the core.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permalink.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permalink.tid
index 8197fd238..7c42ab0b0 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permalink.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permalink.tid	
@@ -1,8 +1,9 @@
 created: 20140723103751357
 modified: 20140723103751357
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-permalink
 type: text/vnd.tiddlywiki
+caption: tm-permalink
 
 The `tm-permalink` message changes the browser address bar to form a [[permalink|PermaLinks]] to a specified tiddler, defaulting to the current tiddler.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permaview.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permaview.tid
index 24b11767c..775928b7d 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permaview.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-permaview.tid	
@@ -1,8 +1,9 @@
 created: 20140723103751357
 modified: 20140723103751357
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-permaview
 type: text/vnd.tiddlywiki
+caption: tm-permaview
 
 The `tm-permaview` message changes the browser address bar to form a [[permaview|PermaLinks]] that specifies all the open tiddlers in the main story river, and the tiddler to be navigated, defaulting to the current tiddler.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid
index 43dfb7436..d6c16af3a 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid	
@@ -1,8 +1,9 @@
 created: 20140908185153663
 modified: 20140908185153663
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-remove-field
 type: text/vnd.tiddlywiki
+caption: tm-remove-field
 
 The `tm-remove-field` message is handled by the FieldMangerWidget. It removes the specified field.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-tag.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-tag.tid
index f75ed7cc7..0de03d338 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-tag.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-tag.tid	
@@ -1,8 +1,9 @@
 created: 20140908185153663
 modified: 20140908185153663
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-remove-tag
 type: text/vnd.tiddlywiki
+caption: tm-remove-tag
 
 The `tm-remove-tag` message is handled by the FieldMangerWidget. It removes the specified tag.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-tiddler.tid
index 36ea73c14..69c4c6d58 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-tiddler.tid	
@@ -1,8 +1,9 @@
 created: 20140226090544323
 modified: 20140226090729828
-tags: message navigator-message
+tags: WidgetMessages navigator-message
 title: WidgetMessage: tm-save-tiddler
 type: text/vnd.tiddlywiki
+caption: tm-save-tiddler
 
 The `tm-save-tiddler` message is applied to draft tiddlers. It saves the draft over the tiddler identified in the `draft.of` field and then deletes the draft. The save tiddler message requires the following properties on the `event` object:
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-wiki.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-wiki.tid
index 0e78edb5b..9cc504aa1 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-wiki.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-save-wiki.tid	
@@ -1,8 +1,9 @@
 created: 20140811112325641
 modified: 20140811115149288
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-save-wiki
 type: text/vnd.tiddlywiki
+caption: tm-save-wiki
 
 The save wiki message causes the current saver module to perform a full save operation. The save operation can involve user interaction.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-server-refresh.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-server-refresh.tid
index 26b0177c4..e6ffb91d5 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-server-refresh.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-server-refresh.tid	
@@ -1,8 +1,9 @@
 created: 20140811112435281
 modified: 20140811113453568
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-server-refresh
 type: text/vnd.tiddlywiki
+caption: tm-server-refresh
 
 The server refresh message attempts to synchronise the latest changes to the current serverside host.
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-set-password.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-set-password.tid
index 31070acf1..1c4edc13b 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-set-password.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-set-password.tid	
@@ -1,8 +1,9 @@
 created: 20140226084623977
 modified: 20140226085200323
-tags: message
+tags: WidgetMessages
 title: WidgetMessage: tm-set-password
 type: text/vnd.tiddlywiki
+caption: tm-set-password
 
 The `tm-set-password` message prompts the user for a new password and stores it in the password vault, replacing any existing password. It also sets the [[$:/isEncrypted]] tiddler. See EncryptionMechanism for details.
 
diff --git a/editions/tw5.com/tiddlers/reference/Editions.tid b/editions/tw5.com/tiddlers/reference/Editions.tid
deleted file mode 100644
index 19a639ec9..000000000
--- a/editions/tw5.com/tiddlers/reference/Editions.tid
+++ /dev/null
@@ -1,7 +0,0 @@
-created: 20140908141300000
-modified: 20140910215613444
-tags: Reference
-title: Editions
-toc-link: no
-type: text/vnd.tiddlywiki
-
diff --git a/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid b/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid
index 90976f885..cc997f8df 100644
--- a/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid
@@ -1,7 +1,8 @@
 title: BrowseWidget
 created: 201310241419
 modified: 20140910200751303
-tags: widget
+tags: Widgets
+caption: browse
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
index 682c98ea2..4c0f5e998 100644
--- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
@@ -1,7 +1,8 @@
 title: ButtonWidget
 created: 201310241419
 modified: 201406170837
-tags: widget
+tags: Widgets
+caption: button
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
index 3ac13ba40..e6f1e198d 100644
--- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid
@@ -1,7 +1,8 @@
 title: CheckboxWidget
 created: 201310241419
 modified: 201407110837
-tags: widget
+tags: Widgets
+caption: checkbox
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/CountWidget.tid b/editions/tw5.com/tiddlers/widgets/CountWidget.tid
index 17a333249..289047bea 100644
--- a/editions/tw5.com/tiddlers/widgets/CountWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/CountWidget.tid
@@ -1,7 +1,8 @@
 title: CountWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: count
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid b/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid
index 18aad32d4..0b0a8c86c 100644
--- a/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid
@@ -1,7 +1,8 @@
 title: DropzoneWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: dropzone
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
index fa1e17032..cbd7b69d7 100644
--- a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid
@@ -1,8 +1,9 @@
 created: 20131024141900000
 modified: 20140221140151790
-tags: widget
+tags: Widgets
 title: EditBitmapWidget
 type: text/vnd.tiddlywiki
+caption: edit-bitmap
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
index 7b7360ca4..db07d1e68 100644
--- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
@@ -1,7 +1,8 @@
 title: EditTextWidget
 created: 201310241419
 modified: 201407250837
-tags: widget
+tags: Widgets
+caption: edit-text
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditWidget.tid b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
index 48360507b..83b648d4e 100644
--- a/editions/tw5.com/tiddlers/widgets/EditWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
@@ -1,7 +1,8 @@
 title: EditWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: edit
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/EncryptWidget.tid b/editions/tw5.com/tiddlers/widgets/EncryptWidget.tid
index 5bdbe33f4..badc0218b 100644
--- a/editions/tw5.com/tiddlers/widgets/EncryptWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EncryptWidget.tid
@@ -1,7 +1,8 @@
 title: EncryptWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: encrypt
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
index 08a175466..d788a82a4 100644
--- a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid
@@ -1,8 +1,9 @@
 created: 20131024141900000
 modified: 20140125140636123
-tags: widget
+tags: Widgets
 title: FieldManglerWidget
 type: text/vnd.tiddlywiki
+caption: fieldmangler
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
index d2662e4aa..9d068ce61 100644
--- a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid
@@ -1,7 +1,8 @@
 title: FieldsWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: fields
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/GridWidget.tid b/editions/tw5.com/tiddlers/widgets/GridWidget.tid
deleted file mode 100644
index bdd15f822..000000000
--- a/editions/tw5.com/tiddlers/widgets/GridWidget.tid
+++ /dev/null
@@ -1,20 +0,0 @@
-title: GridWidget
-tags: widget
-
-The video widget is not yet (re)implemented.
-
-```
-The grid widget assembles tiddlers into a tabular grid based on their titles. For example:
-
-<$grid prefix="GridDemo" rows=3 cols=3/>
-
-In this case, the following tiddlers will be rendered:
-
-|GridDemo_A_1 |GridDemo_A_2 |GridDemo_A_3 |
-|GridDemo_B_1 |GridDemo_B_2 |GridDemo_B_3 |
-|GridDemo_C_1 |GridDemo_C_2 |GridDemo_C_3 |
-
-The result is:
-
-<$grid prefix="GridDemo" rows=3 cols=3/>
-```
diff --git a/editions/tw5.com/tiddlers/widgets/ImageWidget.tid b/editions/tw5.com/tiddlers/widgets/ImageWidget.tid
index d766732aa..ebf65df72 100644
--- a/editions/tw5.com/tiddlers/widgets/ImageWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ImageWidget.tid
@@ -1,7 +1,8 @@
 title: ImageWidget
 created: 20140416160234142
 modified: 20140820100234142
-tags: widget
+tags: Widgets
+caption: image
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/ImportVariablesWidget.tid b/editions/tw5.com/tiddlers/widgets/ImportVariablesWidget.tid
index 3a6e8d65b..c95045571 100644
--- a/editions/tw5.com/tiddlers/widgets/ImportVariablesWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ImportVariablesWidget.tid
@@ -1,8 +1,9 @@
 created: 20140612142500000
 modified: 20140612175900970
-tags: widget
+tags: Widgets
 title: ImportVariablesWidget
 type: text/vnd.tiddlywiki
+caption: importvariables
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
index 0d4b5b0be..4a9f3c166 100644
--- a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
@@ -1,8 +1,9 @@
 created: 20140302192136805
 modified: 20140302192935781
-tags: widget
+tags: Widgets
 title: KeyboardWidget
 type: text/vnd.tiddlywiki
+caption: keyboard
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid
index 3f42418ad..a07986dcd 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid
@@ -1,8 +1,9 @@
 created: 20131024141900000
 modified: 20140409074643650
-tags: widget
+tags: Widgets
 title: LinkCatcherWidget
 type: text/vnd.tiddlywiki
+caption: linkcatcher
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index e8f5b17f4..29d163acb 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -1,7 +1,8 @@
 title: LinkWidget
 created: 201310241419
 modified: 201408280837
-tags: widget
+tags: Widgets
+caption: link
 
 The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to generate external links).
 
diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
index 2f91280eb..3b41c5faa 100644
--- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
@@ -1,7 +1,8 @@
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
 title: ListWidget
+caption: list
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/MacroCallWidget.tid b/editions/tw5.com/tiddlers/widgets/MacroCallWidget.tid
index 56b9d5ca9..35df8e059 100644
--- a/editions/tw5.com/tiddlers/widgets/MacroCallWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/MacroCallWidget.tid
@@ -1,7 +1,8 @@
 title: MacroCallWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: macrocall
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid b/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid
index 7c4bb33cd..03c7bd7d3 100644
--- a/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid
@@ -1,8 +1,9 @@
 created: 20131024141900000
 modified: 20140226194810214
-tags: widget
+tags: Widgets
 title: NavigatorWidget
 type: text/vnd.tiddlywiki
+caption: navigator
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/PasswordWidget.tid b/editions/tw5.com/tiddlers/widgets/PasswordWidget.tid
index 2c51cfa8d..a9acf48e6 100644
--- a/editions/tw5.com/tiddlers/widgets/PasswordWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/PasswordWidget.tid
@@ -1,7 +1,8 @@
 title: PasswordWidget
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
+caption: password
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
index 57b72142e..2b520fbf8 100644
--- a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
@@ -1,8 +1,9 @@
 created: 20131212195353929
 modified: 20131212195656344
-tags: widget
+tags: Widgets
 title: RadioWidget
 type: text/vnd.tiddlywiki
+caption: radio
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid
index 4cf3f569c..0bafa0241 100644
--- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid
@@ -1,8 +1,9 @@
 created: 20131024141900000
 modified: 20140211232346858
-tags: widget
+tags: Widgets
 title: RevealWidget
 type: text/vnd.tiddlywiki
+caption: reveal
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid b/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid
index 62172671a..c033cbd91 100644
--- a/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ScrollableWidget.tid
@@ -1,8 +1,9 @@
 created: 20140324223413403
 modified: 20140324223524945
-tags: widget
+tags: Widgets
 title: ScrollableWidget
 type: text/vnd.tiddlywiki
+caption: scrollable
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/SelectWidget.tid b/editions/tw5.com/tiddlers/widgets/SelectWidget.tid
index 024b186df..4b3ca74b5 100644
--- a/editions/tw5.com/tiddlers/widgets/SelectWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/SelectWidget.tid
@@ -1,7 +1,8 @@
 created: 201310241419
 modified: 201310300837
-tags: widget
+tags: Widgets
 title: SelectWidget
+caption: select
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/SetVariableWidget.tid b/editions/tw5.com/tiddlers/widgets/SetVariableWidget.tid
index c5833e3bc..3b7533c3f 100644
--- a/editions/tw5.com/tiddlers/widgets/SetVariableWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/SetVariableWidget.tid
@@ -1,7 +1,8 @@
 title: SetVariableWidget
 created: 201310241419
 modified: 201311151827
-tags: widget
+tags: Widgets
+caption: setvariable
 
 The `<$setvariable>` widget has been renamed `<$set/>`; see SetWidget for more details.
 
diff --git a/editions/tw5.com/tiddlers/widgets/SetWidget.tid b/editions/tw5.com/tiddlers/widgets/SetWidget.tid
index e520b0de3..86e4838d2 100644
--- a/editions/tw5.com/tiddlers/widgets/SetWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/SetWidget.tid
@@ -1,7 +1,8 @@
 title: SetWidget
 created: 201311151827
 modified: 201311151827
-tags: widget
+tags: Widgets
+caption: set
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/TextWidget.tid b/editions/tw5.com/tiddlers/widgets/TextWidget.tid
index ff1cbfab3..adbab5afd 100644
--- a/editions/tw5.com/tiddlers/widgets/TextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/TextWidget.tid
@@ -1,7 +1,8 @@
 created: 201401191419
 modified: 201401190837
-tags: widget
+tags: Widgets
 title: TextWidget
+caption: text
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
index b831687e2..d52c9d425 100644
--- a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid
@@ -1,8 +1,9 @@
 created: 20130824154300000
 modified: 20140802114152456
-tags: widget
+tags: Widgets
 title: TiddlerWidget
 type: text/vnd.tiddlywiki
+caption: tiddler
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid b/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid
index 6606f5ecd..06653a73b 100644
--- a/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid
@@ -1,8 +1,9 @@
 created: 20130824142500000
 modified: 20140717175900970
-tags: widget
+tags: Widgets
 title: TranscludeWidget
 type: text/vnd.tiddlywiki
+caption: transclude
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
index b5a14ecf7..963d0826e 100644
--- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
@@ -1,7 +1,8 @@
 title: ViewWidget
 created: 201310241419
 modified: 201402220837
-tags: widget
+tags: Widgets
+caption: view
 
 ! Introduction
 
diff --git a/editions/tw5.com/tiddlers/reference/Widgets.tid b/editions/tw5.com/tiddlers/widgets/Widgets.tid
similarity index 70%
rename from editions/tw5.com/tiddlers/reference/Widgets.tid
rename to editions/tw5.com/tiddlers/widgets/Widgets.tid
index 8884ff42c..8ae6ff182 100644
--- a/editions/tw5.com/tiddlers/reference/Widgets.tid
+++ b/editions/tw5.com/tiddlers/widgets/Widgets.tid
@@ -2,6 +2,6 @@ created: 20140908130500000
 modified: 20140910215453457
 tags: Reference
 title: Widgets
-toc-link: no
 type: text/vnd.tiddlywiki
 
+Widgets add dynamic functionality to WikiText.