diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index 97d3f6275..b938428d5 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -22,7 +22,7 @@ title: $:/core/ui/PageTemplate
 <section class="story-river">
 
 <!-- The main story -->
-<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/ViewTemplate" editTemplate="$:/core/ui/EditTemplate" listview="classic" itemClass="tw-tiddler-frame"/>
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/ViewTemplate" editTemplate="$:/core/ui/EditTemplate" listview={{$:/view}} itemClass="tw-tiddler-frame"/>
 
 <!-- End of story river -->
 </section>
diff --git a/core/ui/ToolsPanel.tid b/core/ui/ToolsPanel.tid
index 8b7319275..6364f6204 100644
--- a/core/ui/ToolsPanel.tid
+++ b/core/ui/ToolsPanel.tid
@@ -1,15 +1,18 @@
 title: $:/core/ui/ToolsPanel
 
+---
+
+{{$:/snippets/viewswitcher}}
+
+---
+
+{{$:/snippets/themeswitcher}}
+
+---
+
 Import: <$import class="tw-drop-zone"/>
 
 ---
 
-<$button message="tw-save-wiki" class="btn btn-primary">Save Changes</$button>
-
----
-
 {{$:/snippets/encryptionstatus}}
 
----
-
-{{$:/snippets/themeswitcher}}
diff --git a/core/wiki/view.tid b/core/wiki/view.tid
new file mode 100644
index 000000000..13fe4c5ff
--- /dev/null
+++ b/core/wiki/view.tid
@@ -0,0 +1,3 @@
+title: $:/view
+
+classic
\ No newline at end of file
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
new file mode 100644
index 000000000..13416f041
--- /dev/null
+++ b/core/wiki/viewswitcher.tid
@@ -0,0 +1,13 @@
+title: $:/snippets/viewswitcher
+
+Current theme: {{$:/view}}
+
+<$linkcatcher to="$:/view">
+
+<$list filter="classic zoomin">
+
+<$reveal state="$:/view" type="match" text={{##title}}>&bull;</$reveal><$reveal state="$:/view" type="nomatch" text={{##title}}>&nbsp;</$reveal> <$view field="title" format="link"/>
+
+</$list>
+
+</$linkcatcher>