diff --git a/archive/test/wikitests/EighthTiddler.html b/archive/test/wikitests/EighthTiddler.html
index ef8b3ab2c..0203a6f40 100644
--- a/archive/test/wikitests/EighthTiddler.html
+++ b/archive/test/wikitests/EighthTiddler.html
@@ -1 +1 @@
-<div data-tiddler-target='SixthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>SixthTiddler<br>11 February 2011<br><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a><br></div><br><div data-tiddler-target='SixthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>SixthTiddler<br>11 February 2011<br><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a><br></div><br><div data-tiddler-target='EighthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>EighthTiddler<br><br><br></div><br><div data-tiddler-target='FirstTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>FirstTiddler<br><br><br></div><br>
\ No newline at end of file
+<div data-tiddler-target='EighthTiddler' data-tiddler-template='EighthTiddler' class='tw-tiddler-frame'><div data-tiddler-target='SixthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>SixthTiddler<br>11 February 2011<br><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a><br></div><br><div data-tiddler-target='SixthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>SixthTiddler<br>11 February 2011<br><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a><br></div><br><div data-tiddler-target='EighthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>EighthTiddler<br><br><br></div><br><div data-tiddler-target='FirstTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>FirstTiddler<br><br><br></div><br></div>
\ No newline at end of file
diff --git a/archive/test/wikitests/Fifth Tiddler.html b/archive/test/wikitests/Fifth Tiddler.html
index 5caee7e4d..2710d8d8e 100644
--- a/archive/test/wikitests/Fifth Tiddler.html	
+++ b/archive/test/wikitests/Fifth Tiddler.html	
@@ -1 +1 @@
-<table class='table'><caption align='top'>A caption above the table</caption><thead><tr class='evenRow'><td align='center'>Left</td><td align='center'>Middle</td><td align='center'>Right</td></tr></thead><tbody><tr class='oddRow'><td>North West</td><td>North</td><td>North East</td></tr><tr class='evenRow'><td>West</td><td>Here</td><td>East</td></tr><tr class='oddRow'><td>South West</td><td>South</td><td>South East</td></tr></tbody></table>
\ No newline at end of file
+<div data-tiddler-target='Fifth Tiddler' data-tiddler-template='Fifth Tiddler' class='tw-tiddler-frame'><table class='table'><caption align='top'>A caption above the table</caption><thead><tr class='evenRow'><td align='center'>Left</td><td align='center'>Middle</td><td align='center'>Right</td></tr></thead><tbody><tr class='oddRow'><td>North West</td><td>North</td><td>North East</td></tr><tr class='evenRow'><td>West</td><td>Here</td><td>East</td></tr><tr class='oddRow'><td>South West</td><td>South</td><td>South East</td></tr></tbody></table></div>
\ No newline at end of file
diff --git a/archive/test/wikitests/FirstTiddler.html b/archive/test/wikitests/FirstTiddler.html
index f877ee587..14f19c414 100644
--- a/archive/test/wikitests/FirstTiddler.html
+++ b/archive/test/wikitests/FirstTiddler.html
@@ -1 +1 @@
-This is the <strong>text</strong> of the first tiddler, with a <span style='font-size:8em;color:red;'>link</span> to the <a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a>, too. And a link to <a href='http://tiddlywiki.com/' class='tw-tiddlylink tw-tiddlylink-external'>http://tiddlywiki.com/</a>.<br>
\ No newline at end of file
+<div data-tiddler-target='FirstTiddler' data-tiddler-template='FirstTiddler' class='tw-tiddler-frame'>This is the <strong>text</strong> of the first tiddler, with a <span style='font-size:8em;color:red;'>link</span> to the <a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a>, too. And a link to <a href='http://tiddlywiki.com/' class='tw-tiddlylink tw-tiddlylink-external'>http://tiddlywiki.com/</a>.<br></div>
\ No newline at end of file
diff --git a/archive/test/wikitests/Fourth Tiddler.html b/archive/test/wikitests/Fourth Tiddler.html
index bb1e861f8..b9fa3b19e 100644
--- a/archive/test/wikitests/Fourth Tiddler.html	
+++ b/archive/test/wikitests/Fourth Tiddler.html	
@@ -1 +1 @@
-A missing image <img src='Something.jpg'> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot;
\ No newline at end of file
+<div data-tiddler-target='Fourth Tiddler' data-tiddler-template='Fourth Tiddler' class='tw-tiddler-frame'>A missing image <img src='Something.jpg'> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot;</div>
\ No newline at end of file
diff --git a/archive/test/wikitests/SecondTiddler.html b/archive/test/wikitests/SecondTiddler.html
index 3454d11f8..5e0c661fa 100644
--- a/archive/test/wikitests/SecondTiddler.html
+++ b/archive/test/wikitests/SecondTiddler.html
@@ -1 +1 @@
-<h2>Heading</h2>This is the second tiddler. It has a list:<br><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a macro invocation 5.0.0.a2 and a <span class='myClass'>custom class</span><br>
\ No newline at end of file
+<div data-tiddler-target='SecondTiddler' data-tiddler-template='SecondTiddler' class='tw-tiddler-frame'><h2>Heading</h2>This is the second tiddler. It has a list:<br><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a macro invocation 5.0.0 and a <span class='myClass'>custom class</span><br></div>
\ No newline at end of file
diff --git a/archive/test/wikitests/SecondTiddler.txt b/archive/test/wikitests/SecondTiddler.txt
index a78ebd9d3..9defebc87 100644
--- a/archive/test/wikitests/SecondTiddler.txt
+++ b/archive/test/wikitests/SecondTiddler.txt
@@ -1 +1 @@
-HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a macro invocation 5.0.0.a2 and a custom class
\ No newline at end of file
+HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a macro invocation 5.0.0 and a custom class
\ No newline at end of file
diff --git a/archive/test/wikitests/SeventhTiddler.html b/archive/test/wikitests/SeventhTiddler.html
index 5a8e08982..c71c1b1a9 100644
--- a/archive/test/wikitests/SeventhTiddler.html
+++ b/archive/test/wikitests/SeventhTiddler.html
@@ -1 +1 @@
-4<br><br>SeventhTiddler<br><br>window<br>
\ No newline at end of file
+<div data-tiddler-target='SeventhTiddler' data-tiddler-template='SeventhTiddler' class='tw-tiddler-frame'>4<br><br>SeventhTiddler<br><br>window<br></div>
\ No newline at end of file
diff --git a/archive/test/wikitests/SixthTiddler.html b/archive/test/wikitests/SixthTiddler.html
index 49ad697fc..6b55d3c0c 100644
--- a/archive/test/wikitests/SixthTiddler.html
+++ b/archive/test/wikitests/SixthTiddler.html
@@ -1 +1 @@
-SixthTiddler<br>11 February 2011<br><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a><br>
\ No newline at end of file
+<div data-tiddler-target='SixthTiddler' data-tiddler-template='SixthTiddler' class='tw-tiddler-frame'>SixthTiddler<br>11 February 2011<br><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a><br></div>
\ No newline at end of file
diff --git a/archive/test/wikitests/ThirdTiddler.html b/archive/test/wikitests/ThirdTiddler.html
index f5e7eb5be..5227a2de7 100644
--- a/archive/test/wikitests/ThirdTiddler.html
+++ b/archive/test/wikitests/ThirdTiddler.html
@@ -1 +1 @@
-An explicit link <a href='Fourth%20Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a> and <a href='Fourth%20Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>a pretty link</a> and a transclusion <div data-tiddler-target='Fourth Tiddler' data-tiddler-template='Fourth Tiddler' class='tw-tiddler-frame'>A missing image <img src='Something.jpg'> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot;</div><br><br><img src='http://placehold.it/350x150'><br>
\ No newline at end of file
+<div data-tiddler-target='ThirdTiddler' data-tiddler-template='ThirdTiddler' class='tw-tiddler-frame'>An explicit link <a href='Fourth%20Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a> and <a href='Fourth%20Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>a pretty link</a> and a transclusion <div data-tiddler-target='Fourth Tiddler' data-tiddler-template='Fourth Tiddler' class='tw-tiddler-frame'>A missing image <img src='Something.jpg'> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot;</div><br><br><img src='http://placehold.it/350x150'><br></div>
\ No newline at end of file