diff --git a/editions/tw5.com/tiddlers/concepts/Macros.tid b/editions/tw5.com/tiddlers/concepts/Macros.tid
index 048bd9822..01e4f029b 100644
--- a/editions/tw5.com/tiddlers/concepts/Macros.tid
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -1,6 +1,6 @@
 created: 20140211171341271
-modified: 20140211171348738
-tags: concepts [[Advanced features]]
+modified: 20140910215504098
+tags: concepts Reference
 title: Macros
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/macros/QualifyMacro.tid b/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
index 553a35678..5254f83ea 100644
--- a/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/QualifyMacro.tid
@@ -1,6 +1,6 @@
 created: 20131228164411884
 modified: 20131228164955084
-tags: macros Macros
+tags: Macros
 title: QualifyMacro
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
index 68f59513c..bb0879441 100644
--- a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
@@ -1,5 +1,5 @@
 title: TableOfContentsMacro
-tags: macros Macros
+tags: Macros
 modified: 20140905084423561
 
 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 368a6dd49..796fd9ce2 100644
--- a/editions/tw5.com/tiddlers/macros/TabsMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TabsMacro.tid
@@ -1,6 +1,6 @@
 created: 20131228162203521
 modified: 20140702113527667
-tags: macros Macros
+tags: Macros
 title: TabsMacro
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
index 502377241..6435cad71 100644
--- a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
@@ -1,5 +1,5 @@
 title: TimelineMacro
-tags: macros Macros
+tags: Macros
 modified: 20140905084423561
 
 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 718113572..16e32ea7c 100644
--- a/editions/tw5.com/tiddlers/macros/VersionMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/VersionMacro.tid
@@ -1,6 +1,6 @@
 created: 20131228162448664
 modified: 20131228162605081
-tags: macros Macros
+tags: Macros
 title: VersionMacro
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro Expandable Example.tid b/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Expandable Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/TableOfContentsMacro Expandable Example.tid
rename to editions/tw5.com/tiddlers/samples/TableOfContentsMacro Expandable Example.tid
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro Selective Expandable Example.tid b/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Selective Expandable Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/TableOfContentsMacro Selective Expandable Example.tid
rename to editions/tw5.com/tiddlers/samples/TableOfContentsMacro Selective Expandable Example.tid
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro Simple Example.tid b/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Simple Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/TableOfContentsMacro Simple Example.tid
rename to editions/tw5.com/tiddlers/samples/TableOfContentsMacro Simple Example.tid
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro Sorted Expandable Example.tid b/editions/tw5.com/tiddlers/samples/TableOfContentsMacro Sorted Expandable Example.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/TableOfContentsMacro Sorted Expandable Example.tid
rename to editions/tw5.com/tiddlers/samples/TableOfContentsMacro Sorted Expandable Example.tid