diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid
index 81835e575..7be9eb93e 100644
--- a/core/wiki/macros/list.tid
+++ b/core/wiki/macros/list.tid
@@ -1,14 +1,14 @@
title: $:/core/macros/list
tags: $:/tags/Macro
-\define list-unordered-links(filter)
-
+\define list-links(filter,type:"ul",subtype:"li")
+<$type$>
<$list filter="$filter$">
--
+<$subtype$>
<$link to={{!!title}}>
<$view field="title"/>
$link>
-
+$subtype$>
$list>
-
+$type$>
\end
diff --git a/editions/de-AT-DE/tiddlers/wikitext/WikiText.tid b/editions/de-AT-DE/tiddlers/wikitext/WikiText.tid
index 8e25e44cf..0388bd04f 100644
--- a/editions/de-AT-DE/tiddlers/wikitext/WikiText.tid
+++ b/editions/de-AT-DE/tiddlers/wikitext/WikiText.tid
@@ -11,4 +11,4 @@ type: text/vnd.tiddlywiki
Die folgenden Elemente sind im TW Kern enthalten:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/about/About.tid b/editions/tw5.com/tiddlers/about/About.tid
index ccf64af84..c0f57ea7d 100644
--- a/editions/tw5.com/tiddlers/about/About.tid
+++ b/editions/tw5.com/tiddlers/about/About.tid
@@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki
Information about the making of TiddlyWiki:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/commands/Commands.tid b/editions/tw5.com/tiddlers/commands/Commands.tid
index 757fd0938..7890762d2 100644
--- a/editions/tw5.com/tiddlers/commands/Commands.tid
+++ b/editions/tw5.com/tiddlers/commands/Commands.tid
@@ -3,4 +3,4 @@ tags: Reference
Commands are used with [[TiddlyWiki on Node.js|Using TiddlyWiki on Node.js]].
->
+>
diff --git a/editions/tw5.com/tiddlers/concepts/Concepts.tid b/editions/tw5.com/tiddlers/concepts/Concepts.tid
index 584a96cba..e81c93954 100644
--- a/editions/tw5.com/tiddlers/concepts/Concepts.tid
+++ b/editions/tw5.com/tiddlers/concepts/Concepts.tid
@@ -6,4 +6,4 @@ tags: Reference
These are the concepts underlying TiddlyWiki. Understanding how these ideas fit together is the key to getting the most from TiddlyWiki.
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/concepts/Filters.tid b/editions/tw5.com/tiddlers/concepts/Filters.tid
index 377f73832..e09868c13 100644
--- a/editions/tw5.com/tiddlers/concepts/Filters.tid
+++ b/editions/tw5.com/tiddlers/concepts/Filters.tid
@@ -11,6 +11,6 @@ Filters are used in TiddlyWiki to choose tiddlers by specifying simple match cri
The most common filter operators are:
-<>
+<>
See FilterOperators for a complete list of available filter operators
diff --git a/editions/tw5.com/tiddlers/concepts/Macros.tid b/editions/tw5.com/tiddlers/concepts/Macros.tid
index da9e3e711..d1ec46dd9 100644
--- a/editions/tw5.com/tiddlers/concepts/Macros.tid
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -14,5 +14,5 @@ You can write your own [[Macros in WikiText]] or for more flexibility you can wr
The following macros are built-in to the TiddlyWiki core:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/concepts/Messages.tid b/editions/tw5.com/tiddlers/concepts/Messages.tid
index 7dc6470a5..a36962eeb 100644
--- a/editions/tw5.com/tiddlers/concepts/Messages.tid
+++ b/editions/tw5.com/tiddlers/concepts/Messages.tid
@@ -8,4 +8,4 @@ Widget messages are generated by widgets in response to user actions. They flow
The following widget messages are implemented by the core:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/concepts/WikiText.tid b/editions/tw5.com/tiddlers/concepts/WikiText.tid
index 94322c53c..d8785dc83 100644
--- a/editions/tw5.com/tiddlers/concepts/WikiText.tid
+++ b/editions/tw5.com/tiddlers/concepts/WikiText.tid
@@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki
The following elements of WikiText syntax are built into the core:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/definitions/Definitions.tid b/editions/tw5.com/tiddlers/definitions/Definitions.tid
index 2e3f84879..42ec9cde0 100644
--- a/editions/tw5.com/tiddlers/definitions/Definitions.tid
+++ b/editions/tw5.com/tiddlers/definitions/Definitions.tid
@@ -6,4 +6,4 @@ tags: Reference
These are definitions of technical words and phrases used in this documentation. (As distinct from the [[Concepts]] that make up TiddlyWiki itself).
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
index 6cb6132c0..f0792a718 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Expandable Example.tid
@@ -4,8 +4,8 @@ tags: table-of-contents-example
!! Expandable Table of Contents
-<$macrocall $name="wikitext-example-without-html"
-src="
-<
>
+<$macrocall $name='wikitext-example-without-html'
+src='
+<>
-"/>
+'/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
index 60cf8f082..53783bb73 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Selective Expandable Example.tid
@@ -4,8 +4,8 @@ tags: table-of-contents-example
!! Selective Expandable Table of Contents
-<$macrocall $name="wikitext-example-without-html"
-src="
-<
>
+<$macrocall $name='wikitext-example-without-html'
+src='
+<>
-"/>
+'/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
index cd8611af3..040fc6338 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Simple Example.tid
@@ -4,8 +4,8 @@ tags: table-of-contents-example
!! Simple Table of Contents
-<$macrocall $name="wikitext-example-without-html"
-src="
-<
>
+<$macrocall $name='wikitext-example-without-html'
+src='
+<>
-"/>
+'/>
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
index 94b031e1d..66e9383a8 100644
--- a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Sorted Expandable Example.tid
@@ -4,8 +4,8 @@ tags: table-of-contents-example
!! Sorted Expandable Table of Contents
-<$macrocall $name="wikitext-example-without-html"
-src="
-<
>
+<$macrocall $name='wikitext-example-without-html'
+src='
+<>
-"/>
+'/>
diff --git a/editions/tw5.com/tiddlers/editions/Editions.tid b/editions/tw5.com/tiddlers/editions/Editions.tid
index e4feab980..78f99b836 100644
--- a/editions/tw5.com/tiddlers/editions/Editions.tid
+++ b/editions/tw5.com/tiddlers/editions/Editions.tid
@@ -9,4 +9,4 @@ TiddlyWiki is distributed in several different editions that are tuned for speci
You can mix and match the components of these editions, to make a unique solution to your particular application.
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/features/Features.tid b/editions/tw5.com/tiddlers/features/Features.tid
index 24eb6aef6..3e5247694 100644
--- a/editions/tw5.com/tiddlers/features/Features.tid
+++ b/editions/tw5.com/tiddlers/features/Features.tid
@@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki
Further information about specific TiddlyWiki features:
-<>
+<>
----
diff --git a/editions/tw5.com/tiddlers/learning/Learning.tid b/editions/tw5.com/tiddlers/learning/Learning.tid
index 60668d847..d31597084 100644
--- a/editions/tw5.com/tiddlers/learning/Learning.tid
+++ b/editions/tw5.com/tiddlers/learning/Learning.tid
@@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki
Learn more about using TiddlyWiki:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/macros/ListMacro.tid b/editions/tw5.com/tiddlers/macros/ListMacro.tid
new file mode 100644
index 000000000..4d06cfa38
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/ListMacro.tid
@@ -0,0 +1,27 @@
+title: ListMacro
+tags: Macros
+modified: 20140917083515996
+caption: list
+
+The list macro is a family of macros that produce a list of tiddlers.
+
+There are several variants of the macro:
+
+* `<>` produces a list of links to tiddlers that match a filter expression
+
+! Parameters
+
+|!Position |!Name |!Description |!Default |
+|1st |filter |Filter expression | |
+|2nd |type |HTML tag to be used for the list wrapper |"ul" |
+|3rd |subtype |HTML tag to be used for list entries |"li" |
+
+! Examples
+
+<$macrocall $name='wikitext-example-without-html'
+src='<>
+'/>
+
+<$macrocall $name='wikitext-example-without-html'
+src='<>
+'/>
diff --git a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
index 74a00eec9..1f9396518 100644
--- a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid
@@ -26,10 +26,6 @@ To restrict the timeline to a particular tag, the subfilter can be set to someth
! Examples
-```
-<>
-```
-
-Renders as:
-
-<>
+<$macrocall $name="wikitext-example-without-html"
+src="<>
+"/>
diff --git a/editions/tw5.com/tiddlers/mechanisms/Mechanisms.tid b/editions/tw5.com/tiddlers/mechanisms/Mechanisms.tid
index 36a71164e..8997069d9 100644
--- a/editions/tw5.com/tiddlers/mechanisms/Mechanisms.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/Mechanisms.tid
@@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki
These are the internal mechanisms that fit together to make up TiddlyWiki.
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/reference/Reference.tid b/editions/tw5.com/tiddlers/reference/Reference.tid
index 72b7dfecd..2ead9fc0a 100644
--- a/editions/tw5.com/tiddlers/reference/Reference.tid
+++ b/editions/tw5.com/tiddlers/reference/Reference.tid
@@ -7,4 +7,4 @@ list: Concepts Definitions WikiText Macros Widgets Filters Messages Commands Mec
The following topics provide the canonical reference documentation for TiddlyWiki:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/saving/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid
index d1910bbcb..6268ca4ca 100644
--- a/editions/tw5.com/tiddlers/saving/Saving.tid
+++ b/editions/tw5.com/tiddlers/saving/Saving.tid
@@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki
Available methods for saving changes with TiddlyWiki:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid b/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid
index b5b4278fa..85315b93c 100644
--- a/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid
+++ b/editions/tw5.com/tiddlers/tocproject/Working with TiddlyWiki.tid
@@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki
Information to help you get started using TiddlyWiki:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/videos/Videos.tid b/editions/tw5.com/tiddlers/videos/Videos.tid
index 5c95af09d..41f2c1e75 100644
--- a/editions/tw5.com/tiddlers/videos/Videos.tid
+++ b/editions/tw5.com/tiddlers/videos/Videos.tid
@@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki
The following TiddlyWiki videos are available
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/widgets/Widgets.tid b/editions/tw5.com/tiddlers/widgets/Widgets.tid
index e9d70f14c..a45f01ae8 100644
--- a/editions/tw5.com/tiddlers/widgets/Widgets.tid
+++ b/editions/tw5.com/tiddlers/widgets/Widgets.tid
@@ -8,4 +8,4 @@ Widgets add dynamic functionality to WikiText.
The following widgets are built into the core:
-<>
+<>
diff --git a/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid
index 6326a6274..97566ab7d 100644
--- a/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid
+++ b/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid
@@ -26,4 +26,4 @@ See [[HTML in WikiText]] for more details.
The available widgets include:
-<>
+<>