diff --git a/editions/tw5.com/tiddlers/aaa.a.tid b/editions/tw5.com/tiddlers/aaa.a.tid
index 15113ae1e..5250c7c99 100644
--- a/editions/tw5.com/tiddlers/aaa.a.tid
+++ b/editions/tw5.com/tiddlers/aaa.a.tid
@@ -1,5 +1,6 @@
 created: 20240208110758671
-modified: 20240208142728180
+modified: 20240723091044063
+tag-like: aaa
 title: aaa.a
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/aaa.b.1.tid b/editions/tw5.com/tiddlers/aaa.b.1.tid
new file mode 100644
index 000000000..138702d19
--- /dev/null
+++ b/editions/tw5.com/tiddlers/aaa.b.1.tid
@@ -0,0 +1,10 @@
+created: 20240723090930572
+modified: 20240723091006596
+tag-like: aaa.b
+tags: 
+title: aaa.b.1
+type: text/vnd.tiddlywiki
+
+\import [[b b]]
+
+<<list-fields>>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/aaa.b.tid b/editions/tw5.com/tiddlers/aaa.b.tid
index feef0fe1a..6af6743ea 100644
--- a/editions/tw5.com/tiddlers/aaa.b.tid
+++ b/editions/tw5.com/tiddlers/aaa.b.tid
@@ -1,6 +1,6 @@
 created: 20240208110754007
-modified: 20240208142720804
-tag-like: aaa.b.1
+modified: 20240723091032175
+tag-like: aaa
 title: aaa.b
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/aaa.tid b/editions/tw5.com/tiddlers/aaa.tid
index 9611eb041..1c55ce10e 100644
--- a/editions/tw5.com/tiddlers/aaa.tid
+++ b/editions/tw5.com/tiddlers/aaa.tid
@@ -1,6 +1,6 @@
 created: 20240202131427117
-modified: 20240208155800851
-tag-like: aaa.a aaa.b
+modified: 20240723091102490
+tag-like: tag-like-root
 tags: root [[b b]] aaa
 title: aaa
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/b b.tid b/editions/tw5.com/tiddlers/b b.tid
index 3f11fdc83..74d0360f1 100644
--- a/editions/tw5.com/tiddlers/b b.tid	
+++ b/editions/tw5.com/tiddlers/b b.tid	
@@ -1,6 +1,7 @@
 caption: b b-caption
 created: 20240202131440055
-modified: 20240208154625928
+modified: 20240723104825891
+tag-like: tag-like-root
 tags: aaa
 test: b b-test
 title: b b
@@ -18,6 +19,18 @@ type: text/vnd.tiddlywiki
 </table>
 \end
 
+This tiddler contains the `list-fields` procedure which is included in many test tiddlers.
+
+```
+\procedure list-fields()
+<table class="tc-view-field-table">
+<tbody>
+<$list filter="[all[current]fields[]sort[title]] -text -title -bag -modified -created -revision -type " template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>
+</tbody>
+</table>
+\end
+```
+
 * This tiddler is part of the ''tag-tree''
 * It toc-includes all tiddlers tagged: `todo`
 ** The todo's are intended to be shown with a custom template, that contains checkboxes and triggers a "done" action (NOT implemented yet)
diff --git a/editions/tw5.com/tiddlers/c c.tid b/editions/tw5.com/tiddlers/c c.tid
index 2a619abe0..6d0026479 100644
--- a/editions/tw5.com/tiddlers/c c.tid	
+++ b/editions/tw5.com/tiddlers/c c.tid	
@@ -1,5 +1,6 @@
 created: 20240618195529960
-modified: 20240618202636843
+modified: 20240723090706837
+tag-like: tag-like-root
 tags: 
 title: c c
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/ccc.tid b/editions/tw5.com/tiddlers/ccc.tid
index f60b7acff..2a2722a16 100644
--- a/editions/tw5.com/tiddlers/ccc.tid
+++ b/editions/tw5.com/tiddlers/ccc.tid
@@ -1,6 +1,6 @@
 created: 20240202225320834
-modified: 20240208142512918
-tag-like: tag-like-c tag-like-d
+modified: 20240723091154737
+tag-like: tag-like-root
 tags: [[b b]]
 title: ccc
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/p1.1.tid b/editions/tw5.com/tiddlers/p1.1.tid
index 85941ce78..ca253ec18 100644
--- a/editions/tw5.com/tiddlers/p1.1.tid
+++ b/editions/tw5.com/tiddlers/p1.1.tid
@@ -1,5 +1,5 @@
 created: 20240206220521559
-modified: 20240208142702506
+modified: 20240723091924604
 parent: p1
 tags: 
 title: p1.1
@@ -7,4 +7,6 @@ type: text/vnd.tiddlywiki
 
 \import [[b b]]
 
+this tiddler is excluded in the function call of [[test-tv-toc-show-new-child]] with the "exclude:" parameter
+
 <<list-fields>>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/tag-like-c.tid b/editions/tw5.com/tiddlers/tag-like-c.tid
index ec607dd5c..dafd45eff 100644
--- a/editions/tw5.com/tiddlers/tag-like-c.tid
+++ b/editions/tw5.com/tiddlers/tag-like-c.tid
@@ -1,5 +1,6 @@
 created: 20240208110514237
-modified: 20240208143021568
+modified: 20240723090828876
+tag-like: ccc
 title: tag-like-c
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/tag-like-d.tid b/editions/tw5.com/tiddlers/tag-like-d.tid
index 1f49bf9bb..735b52c07 100644
--- a/editions/tw5.com/tiddlers/tag-like-d.tid
+++ b/editions/tw5.com/tiddlers/tag-like-d.tid
@@ -1,5 +1,6 @@
 created: 20240208110520748
-modified: 20240208143028142
+modified: 20240723090817762
+tag-like: ccc
 title: tag-like-d
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/tag-like-root.tid b/editions/tw5.com/tiddlers/tag-like-root.tid
index 3fbb954ff..940efb910 100644
--- a/editions/tw5.com/tiddlers/tag-like-root.tid
+++ b/editions/tw5.com/tiddlers/tag-like-root.tid
@@ -1,6 +1,5 @@
 created: 20240206222045871
-modified: 20240618195523732
-tag-like: aaa [[b b]] ccc [[c c]]
+modified: 20240723090523183
 tags: 
 title: tag-like-root
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/test-Contents-toc-hide.tid b/editions/tw5.com/tiddlers/test-Contents-toc-hide.tid
index 9d8e954bf..9d60dae51 100644
--- a/editions/tw5.com/tiddlers/test-Contents-toc-hide.tid
+++ b/editions/tw5.com/tiddlers/test-Contents-toc-hide.tid
@@ -1,10 +1,10 @@
 created: 20240213183404352
-modified: 20240213195440187
+modified: 20240723104436360
 tags: testTOC
 title: test-Contents-toc-hide
 type: text/vnd.tiddlywiki
 
-\procedure openBranch()
+<<wikitext-example-without-html src:"""\procedure openBranch()
 <<toc-openBranch path:"/" currentTiddler:"test-Contents-toc-hide" manual:yes>>
 \end
 
@@ -15,26 +15,27 @@ type: text/vnd.tiddlywiki
 <$button actions=<<openBranch>>>Open Tree</$button>
 
 <$button actions=<<closeBranch>>>Close Tree</$button>
+""">>
 
 [[toc-1.1.1-hidden]] contains a field: `toc-hide: yes`
 
 The following examples uses the `toc-hide: yes` field in the currentTiddler to exclude a tiddler from the current branch
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"test-Contents-toc-hide">>
-</div>
+</div>""">>
 
 The following examples uses: `exclude:"[toc-hide[yes]]"`, which allows you to use any field name with a specific value to be excluded from every branch
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"test-Contents-toc-hide" exclude:"[toc-hide[yes]]">>
-</div>
+</div>""">>
 
 ----------
 
 simple toc as a reference
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc "test-Contents-toc-hide">>
-</div>
+</div>""">>
 
diff --git a/editions/tw5.com/tiddlers/test-Contents.tid b/editions/tw5.com/tiddlers/test-Contents.tid
index bf805a119..f769a3c95 100644
--- a/editions/tw5.com/tiddlers/test-Contents.tid
+++ b/editions/tw5.com/tiddlers/test-Contents.tid
@@ -1,10 +1,10 @@
 created: 20240203175824154
-modified: 20240213183451394
+modified: 20240723104703300
 tags: testTOC
 title: test-Contents
 type: text/vnd.tiddlywiki
 
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc "Contents">>
-</div>
\ No newline at end of file
+</div>""">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-contacts.tid b/editions/tw5.com/tiddlers/test-contacts.tid
index 2e9568579..4bc6ddec7 100644
--- a/editions/tw5.com/tiddlers/test-contacts.tid
+++ b/editions/tw5.com/tiddlers/test-contacts.tid
@@ -1,5 +1,5 @@
 created: 20240204014515455
-modified: 20240208172037692
+modified: 20240723104714236
 tags: testTOC
 title: test-contacts
 type: text/vnd.tiddlywiki
@@ -7,6 +7,6 @@ type: text/vnd.tiddlywiki
 * This tiddler was created to test [[contacts]] tiddler, which contains a `toc-include`
 * There is a [[Talk-thread|https://talk.tiddlywiki.org/t/proposal-toc-macros-rewrite-using-if-functions-and-procedures-new-fuctionality/9046/32?u=pmario]], where Scott posts his version as a JSON file.
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc "root" >>
-</div>
+</div>""">>
diff --git a/editions/tw5.com/tiddlers/test-open-close-branch-buttons.tid b/editions/tw5.com/tiddlers/test-open-close-branch-buttons.tid
index 73f7b5b73..cc3849e8e 100644
--- a/editions/tw5.com/tiddlers/test-open-close-branch-buttons.tid
+++ b/editions/tw5.com/tiddlers/test-open-close-branch-buttons.tid
@@ -1,10 +1,10 @@
 created: 20240207155537595
-modified: 20240208172049452
+modified: 20240723104321662
 tags: testTOC
 title: test-open-close-branch-buttons
 type: text/vnd.tiddlywiki
 
-\procedure closeBranch()
+<<wikitext-example-without-html src:"""\procedure closeBranch()
 <<toc-closeBranch path:"/Contents" currentTiddler:"Second" manual:yes>>
 \end
 
@@ -15,17 +15,18 @@ type: text/vnd.tiddlywiki
 <$button actions=<<openBranch>>>Open whole Tree</$button>
 
 <$button actions=<<closeBranch>>>Close branch: Second</$button>
+""">>
 
 ''CTRL-click'' will also expand / fold the whole branch. 
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"Contents">>
-</div>
+</div>""">>
 
 --------
 
 simple docs toc as reference
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc tag:"Contents">>
-</div>
\ No newline at end of file
+</div>""">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-parent-field-toc.tid b/editions/tw5.com/tiddlers/test-parent-field-toc.tid
index c5a5af2e5..e5706b379 100644
--- a/editions/tw5.com/tiddlers/test-parent-field-toc.tid
+++ b/editions/tw5.com/tiddlers/test-parent-field-toc.tid
@@ -1,56 +1,57 @@
 created: 20240206215732068
-modified: 20240213202254561
+modified: 20240723104117247
 tags: testTOC
 title: test-parent-field-toc
 type: text/vnd.tiddlywiki
 
 ''toc-selective expandable''
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"root" parentField:"parent" exclude:"p1.1">>
-</div>
+</div>""">>
 
 ---
 
 ''toc-expandable''
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-expandable tag:"root" parentField:"parent">>
-</div>
+</div>""">>
 
 ---
 
 ''tocP'' macro `field: parent`
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<tocP tag:"root" >>
-</div>
+</div>""">>
+
 
 ------
 
 ''tocP'' macro `field: dad`
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<tocP tag:"root" field:dad>>
-</div>
+</div>""">>
 
 --------
 
 ''toc'' macro `parentField: dad` -- TODO: Add parentItemTemplate with tocP-like NewHere buttons
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc tag:"root" parentField:dad>>
-</div>
+</div>""">>
 
 ----------
 
 ''toc-tabbed-internal-nav'' -- `parentField: parent`
 
-<$macrocall
+<<wikitext-example-without-html src:"""<$macrocall
 	$name="toc-tabbed-internal-nav"
 	tag="root"
 	selectedTiddler="$:/temp/toc/selectedTiddler"
 	unselectedText="<p>Select a topic in the table of contents. Click the arrow to expand a topic.</p>"
 	missingText="<p>Missing tiddler.</p>"
 	parentField="parent"
-/>
\ No newline at end of file
+/>""">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-parent-include-CTLR-click.tid b/editions/tw5.com/tiddlers/test-parent-include-CTLR-click.tid
index a836d0a79..af63eb11a 100644
--- a/editions/tw5.com/tiddlers/test-parent-include-CTLR-click.tid
+++ b/editions/tw5.com/tiddlers/test-parent-include-CTLR-click.tid
@@ -1,11 +1,11 @@
 created: 20240208121820397
-modified: 20240208172055595
+modified: 20240723104002405
 tags: testTOC
 title: test-parent-include-CTLR-click
 type: text/vnd.tiddlywiki
 
 CTRL-click on p1 should open the whole path including `toc-include`
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"root" parentField:"parent" exclude:"p1.1">>
-</div>
+</div>""">>
diff --git a/editions/tw5.com/tiddlers/test-styles.tid b/editions/tw5.com/tiddlers/test-styles.tid
index 369e60b1b..1fbf4b560 100644
--- a/editions/tw5.com/tiddlers/test-styles.tid
+++ b/editions/tw5.com/tiddlers/test-styles.tid
@@ -1,5 +1,5 @@
 created: 20240206133241785
-modified: 20240208135458608
+modified: 20240723103429610
 tags: $:/tags/Stylesheet testTOC
 title: test-styles
 type: text/vnd.tiddlywiki
@@ -32,3 +32,7 @@ type: text/vnd.tiddlywiki
 .tc-toc-hide> button > svg {
   fill: red;
 }
+
+.tc-toc-unlinked {
+	margin-left: .5em;
+}
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-toc-expandable.tid b/editions/tw5.com/tiddlers/test-toc-expandable.tid
index d89af6f2a..e37c7cdbd 100644
--- a/editions/tw5.com/tiddlers/test-toc-expandable.tid
+++ b/editions/tw5.com/tiddlers/test-toc-expandable.tid
@@ -1,17 +1,17 @@
 created: 20240208130742136
-modified: 20240208172101138
+modified: 20240723103937692
 tags: testTOC
 title: test-toc-expandable
 type: text/vnd.tiddlywiki
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-expandable tag:"root" viewField:test  >>
-</div>
+</div>""">>
 
 ----
 
 simple toc as reference
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc tag:"root" viewField:test  >>
-</div>
+</div>""">>
diff --git a/editions/tw5.com/tiddlers/test-toc-filter-field.tid b/editions/tw5.com/tiddlers/test-toc-filter-field.tid
index a166bf1ac..fc92f12be 100644
--- a/editions/tw5.com/tiddlers/test-toc-filter-field.tid
+++ b/editions/tw5.com/tiddlers/test-toc-filter-field.tid
@@ -1,5 +1,5 @@
 created: 20240208132923069
-modified: 20240208172104378
+modified: 20240723103904274
 tags: testTOC
 title: test-toc-filter-field
 type: text/vnd.tiddlywiki
@@ -8,14 +8,14 @@ type: text/vnd.tiddlywiki
 * CTRL-click on aaa-''chevron'' should expand / fold the whole tree
 * Also see [[test-open-close-branch-buttons]]
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"root" viewField:test  viewFieldTemplate:template>>
-</div>
+</div>""">>
 
 --------
 
 simple toc as reference
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc tag:"root" viewField:test  viewFieldTemplate:template>>
-</div>
\ No newline at end of file
+</div>""">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-toc-simple-expandable-tabbed-internal.tid b/editions/tw5.com/tiddlers/test-toc-simple-expandable-tabbed-internal.tid
index f44bc12b1..b3968f51c 100644
--- a/editions/tw5.com/tiddlers/test-toc-simple-expandable-tabbed-internal.tid
+++ b/editions/tw5.com/tiddlers/test-toc-simple-expandable-tabbed-internal.tid
@@ -1,5 +1,5 @@
 created: 20240206142124740
-modified: 20240208172109190
+modified: 20240723095239945
 tags: testTOC
 title: test-toc-simple-expandable-tabbed-internal
 type: text/vnd.tiddlywiki
@@ -7,20 +7,19 @@ type: text/vnd.tiddlywiki
 * show template field
 * show caption field
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc tag:"root" viewField:test  viewFieldTemplate:template>>
-</div>
+</div>""">>
 
 ---
 
 the following toc is `toc-expandable` so it shows chevrons with every node
 
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc-expandable tag:"root"   >>
-</div>
+</div>""">>
 
-
-<$macrocall
+<<wikitext-example-without-html src:"""<$macrocall
 	$name="toc-tabbed-internal-nav"
 	tag="root"
 	selectedTiddler="$:/temp/toc/selectedTiddler"
@@ -28,4 +27,4 @@ the following toc is `toc-expandable` so it shows chevrons with every node
 	missingText="<p>Missing tiddler.</p>"
     viewField=test
 viewFieldTemplate=template
-/>
\ No newline at end of file
+/>""">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-toc-sorted-names.tid b/editions/tw5.com/tiddlers/test-toc-sorted-names.tid
index 50b3c99f7..19b707e69 100644
--- a/editions/tw5.com/tiddlers/test-toc-sorted-names.tid
+++ b/editions/tw5.com/tiddlers/test-toc-sorted-names.tid
@@ -1,5 +1,5 @@
 created: 20240204195218153
-modified: 20240208172112010
+modified: 20240723095135240
 tags: testTOC
 title: test-toc-sorted-names
 type: text/vnd.tiddlywiki
@@ -18,8 +18,7 @@ Also see [[Talk thread about new toc-macros|https://talk.tiddlywiki.org/t/propos
 
 * In the ''People'' section, they’re ''sorted by last name'', and for those with the same last name, by first name. And that’s exactly what I was looking for.
 
-
-<div class="tc-table-of-contents">
+<<wikitext-example-without-html src:"""<div class="tc-table-of-contents">
 <<toc tag:"nameSorted">>
-</div>
+</div>""">>
 
diff --git a/editions/tw5.com/tiddlers/test-tv-toc-show-new-child.tid b/editions/tw5.com/tiddlers/test-tv-toc-show-new-child.tid
index a77bfcb2e..a0af6926e 100644
--- a/editions/tw5.com/tiddlers/test-tv-toc-show-new-child.tid
+++ b/editions/tw5.com/tiddlers/test-tv-toc-show-new-child.tid
@@ -1,17 +1,12 @@
 created: 20240618145407617
-modified: 20240618150119710
+modified: 20240723095028937
 tags: 
 title: test-tv-toc-show-new-child
 type: text/vnd.tiddlywiki
 
-\define tv-toc-show-new-child() yes
 
-```
-\define tv-toc-show-new-child() yes
-```
-
-''toc-selective expandable''
+<<wikitext-example-without-html src:"""\define tv-toc-show-new-child() yes
 
 <div class="tc-table-of-contents">
 <<toc-selective-expandable tag:"root" parentField:"parent" exclude:"p1.1">>
-</div>
\ No newline at end of file
+</div>""">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/todo1.tid b/editions/tw5.com/tiddlers/todo1.tid
index 028ccfdd3..b394409de 100644
--- a/editions/tw5.com/tiddlers/todo1.tid
+++ b/editions/tw5.com/tiddlers/todo1.tid
@@ -1,5 +1,5 @@
 created: 20240204010938186
-modified: 20240208154721965
+modified: 20240723100350555
 tags: todo
 title: todo1
 toc-link: no
diff --git a/editions/tw5.com/tiddlers/todo2.tid b/editions/tw5.com/tiddlers/todo2.tid
index db89e4866..b7275e7d0 100644
--- a/editions/tw5.com/tiddlers/todo2.tid
+++ b/editions/tw5.com/tiddlers/todo2.tid
@@ -1,5 +1,5 @@
 created: 20240204010944841
-modified: 20240208142557427
+modified: 20240723100333366
 tag-like: todo2.1
 tags: todo
 title: todo2
diff --git a/editions/tw5.com/tiddlers/xroot.tid b/editions/tw5.com/tiddlers/xroot.tid
new file mode 100644
index 000000000..7b4531ae0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/xroot.tid
@@ -0,0 +1,5 @@
+created: 20240722145152277
+modified: 20240722150555884
+tags: 
+title: xroot
+type: text/vnd.tiddlywiki
\ No newline at end of file