diff --git a/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid b/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid
index 097e15787..67895337f 100644
--- a/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid
+++ b/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid
@@ -1,4 +1,3 @@
 title: $:/plugins/tiddlywiki/text-slicer/exporters/full-doc
-tags: $:/tags/ViewTemplate
 
-<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler" listItem="item"/>
+<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/static/tiddler" listItem="item"/>
diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
index f50cb1a68..e362e7cff 100644
--- a/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
@@ -21,7 +21,10 @@ $:/config/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
 
 <$checkbox tiddler=<<config-show-toolbar>> field="text" checked="yes" unchecked="no" default="no"> Show toolbar</$checkbox>
 
-{{||$:/plugins/tiddlywiki/text-slicer/ui/view-document-button}}
+<$button>
+<$action-sendmessage $message="tm-open-window" $param=<<currentTiddler>> template="$:/plugins/tiddlywiki/text-slicer/exporters/full-doc"/>
+View document
+</$button>
 
 </div>
 
diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
index b8cdb9c65..fd8241be8 100644
--- a/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
@@ -8,8 +8,6 @@ $(tv-heading-status-config-title)$/$(currentTiddler)$
 <$set name="tv-heading-status-config-title" value=<<config-heading-status>>>
 <div class="tc-document-tiddler">
 <div class="tc-document-tiddler-toolbar">
-
-<$list filter="[<tv-show-gadgets>prefix[yes]]" variable="hasToolbar">
 <$reveal type="nomatch" state=<<tv-heading-status-config-title>> text="open" default=<<tv-default-heading-state>>>
 <$button set=<<tv-heading-status-config-title>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
@@ -20,8 +18,6 @@ $(tv-heading-status-config-title)$/$(currentTiddler)$
 {{$:/core/images/right-arrow}}
 </$button>
 </$reveal>
-</$list>
-
 </div>
 <$link tag="$level$" class="tc-document-tiddler-link">
 <$view field="text"/>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/document.tid b/plugins/tiddlywiki/text-slicer/templates/static/document.tid
new file mode 100644
index 000000000..5ce544c2e
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/document.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/document
+
+<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/static/tiddler" listItem="item"/>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/heading.tid b/plugins/tiddlywiki/text-slicer/templates/static/heading.tid
new file mode 100644
index 000000000..18ab5592f
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/heading.tid
@@ -0,0 +1,10 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/heading
+
+\define body(level:"h1")
+<$level$>
+<$view field="text"/>
+</$level$>
+<$list filter="[tag<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/static/tiddler" listItem="item"/>
+\end
+
+<$macrocall $name="body" level={{!!toc-heading-level}}/>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/item.tid b/plugins/tiddlywiki/text-slicer/templates/static/item.tid
new file mode 100644
index 000000000..f0175111f
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/item.tid
@@ -0,0 +1,7 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/item
+
+<$link tag="li" class="tc-document-tiddler-link">
+
+<$transclude/>
+
+</$link>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/list.tid b/plugins/tiddlywiki/text-slicer/templates/static/list.tid
new file mode 100644
index 000000000..cab7367df
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/list.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/list
+
+\define body(type:"ul")
+<$type$>
+<$list filter={{!!text}} template="$:/plugins/tiddlywiki/text-slicer/templates/static/tiddler" listItem="item"/>
+</$type$>
+\end
+
+<$macrocall $name="body" type={{!!toc-list-type}}/>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/paragraph.tid b/plugins/tiddlywiki/text-slicer/templates/static/paragraph.tid
new file mode 100644
index 000000000..d7b827651
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/paragraph.tid
@@ -0,0 +1,7 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/paragraph
+
+<$link tag="div" class="tc-document-tiddler-link">
+
+<$transclude/>
+
+</$link>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid
new file mode 100644
index 000000000..1a3c9a51f
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid
@@ -0,0 +1,21 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/tiddler
+
+<$reveal type="match" state="!!toc-type" text="document">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/document" mode="block"/>
+</$reveal>
+
+<$reveal type="match" state="!!toc-type" text="heading">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/heading" mode="block"/>
+</$reveal>
+
+<$reveal type="match" state="!!toc-type" text="paragraph">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/paragraph" mode="block"/>
+</$reveal>
+
+<$reveal type="match" state="!!toc-type" text="list">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/list" mode="block"/>
+</$reveal>
+
+<$reveal type="match" state="!!toc-type" text="item">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/item" mode="block"/>
+</$reveal>
diff --git a/plugins/tiddlywiki/text-slicer/ui/preview-column.tid b/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
index 91f0e03e5..da0fbfcdd 100644
--- a/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
@@ -5,12 +5,8 @@ tags: $:/tags/AboveStory
 
 <$set name="tv-default-heading-state" value="closed">
 
-<$set name="tv-show-gadgets" value="yes">
-
 <$list filter="[toc-type[document]!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/document"/>
 
 </$set>
 
-</$set>
-
 </$scrollable>
diff --git a/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid b/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid
index 95e298f6a..5d6d472e7 100644
--- a/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid
@@ -1,7 +1,5 @@
 title: $:/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar
 
-<$list filter="[<tv-show-gadgets>prefix[yes]]" variable="hasToolbar">
 <div class="tc-slice-toolbar">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/TextSlicerToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </div>
-</$list>
diff --git a/plugins/tiddlywiki/text-slicer/ui/view-document-button.tid b/plugins/tiddlywiki/text-slicer/ui/view-document-button.tid
deleted file mode 100644
index 4afdf4d90..000000000
--- a/plugins/tiddlywiki/text-slicer/ui/view-document-button.tid
+++ /dev/null
@@ -1,6 +0,0 @@
-title: $:/plugins/tiddlywiki/text-slicer/ui/view-document-button
-
-<$button>
-<$action-sendmessage $message="tm-open-window" $param=<<currentTiddler>> template="$:/plugins/tiddlywiki/text-slicer/exporters/full-doc"/>
-View document
-</$button>
diff --git a/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid b/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
index 9e128b4f8..09d7a8e1c 100644
--- a/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
@@ -13,14 +13,10 @@ tags: $:/tags/ViewTemplate
 
 <$set name="tv-default-heading-state" value="open">
 
-<$set name="tv-show-gadgets" value="yes">
-
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler"/>
 
 </$set>
 
-</$set>
-
 </div>
 
 </$reveal>