diff --git a/core/ui/ControlPanel.tid b/core/ui/ControlPanel.tid
new file mode 100644
index 000000000..990576578
--- /dev/null
+++ b/core/ui/ControlPanel.tid
@@ -0,0 +1,3 @@
+title: $:/ControlPanel
+
+<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel]]" "$:/core/ui/ControlPanel/Basics">></div>
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
new file mode 100644
index 000000000..40bead91c
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance.tid
@@ -0,0 +1,11 @@
+title: $:/core/ui/ControlPanel/Appearance
+tags: $:/tags/ControlPanel
+caption: Appearance
+
+! Theme
+
+{{$:/snippets/themeswitcher}}
+
+! Story View
+
+{{$:/snippets/viewswitcher}}
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
new file mode 100644
index 000000000..0f36913ef
--- /dev/null
+++ b/core/ui/ControlPanel/Basics.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Basics
+tags: $:/tags/ControlPanel
+caption: Basics
+
+|[[Title of this TiddlyWiki|SiteTitle]] |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
+|[[Subtitle|SiteSubtitle]] |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
+|[[Username for signing edits|$:/status/UserName]] |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
+|[[Animation duration|$:/config/AnimationDuration]] |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|[[DefaultTiddlers|$:/DefaultTiddlers]] |Choose which tiddlers are displayed at startup:<br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/> |
diff --git a/core/ui/ControlPanel/Encryption.tid b/core/ui/ControlPanel/Encryption.tid
new file mode 100644
index 000000000..178647e9e
--- /dev/null
+++ b/core/ui/ControlPanel/Encryption.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Encryption
+tags: $:/tags/ControlPanel
+caption: Encryption
+
+{{$:/snippets/encryptionstatus}}
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Info.tid b/core/ui/ControlPanel/Info.tid
new file mode 100644
index 000000000..c2cf8f190
--- /dev/null
+++ b/core/ui/ControlPanel/Info.tid
@@ -0,0 +1,13 @@
+title: $:/core/ui/ControlPanel/Info
+tags: $:/tags/ControlPanel
+caption: Info
+
+! Your Stuff
+
+* Number of tiddlers: <$count filter="[!is[system]]"/>
+
+! TiddlyWiki's Stuff
+
+* Number of system tiddlers: <$count filter="[is[system]]"/>
+* Number of shadow tiddlers: <$count filter="[is[shadow]]"/>
+** Number of over-ridden shadow tiddlers: <$count filter="[!is[system]is[shadow]]"/>
diff --git a/core/wiki/ConfigInfo.tid b/core/ui/ControlPanel/Internals.tid
similarity index 69%
rename from core/wiki/ConfigInfo.tid
rename to core/ui/ControlPanel/Internals.tid
index db85ba9f9..e4f6d0a1b 100644
--- a/core/wiki/ConfigInfo.tid
+++ b/core/ui/ControlPanel/Internals.tid
@@ -1,6 +1,6 @@
-title: $:/ConfigInfo
-
-This tiddler displays the internal configuration of this wiki, which can be useful for troubleshooting, or just to help understand how TiddlyWiki5 works.
+title: $:/core/ui/ControlPanel/Internals
+tags: $:/tags/ControlPanel
+caption: Internals
 
 ! Tiddler fields
 
diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid
new file mode 100644
index 000000000..ee91a4ddb
--- /dev/null
+++ b/core/ui/ControlPanel/Plugins.tid
@@ -0,0 +1,7 @@
+title: $:/core/ui/ControlPanel/Plugins
+tags: $:/tags/ControlPanel
+caption: Plugins
+
+<table><tbody><tr><th>Title</th><th>Description</th></tr><$list filter="[!has[draft.of]has[plugin-type]sort[title]]"><tr><td><$link to={{!!title}}><$view field="title"/></$link></td><td><$view field="description"/></td></tr></$list>
+</tbody>
+</table>
diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid
index 36071162a..6a3cde943 100644
--- a/core/wiki/ControlPanel.tid
+++ b/core/wiki/ControlPanel.tid
@@ -1,4 +1,4 @@
-title: $:/ControlPanel
+title: $:/ControlPanel_old
 
 ''Initial setup''
 
diff --git a/core/wiki/WikiInfo.tid b/core/wiki/WikiInfo.tid
deleted file mode 100644
index 8c0087adc..000000000
--- a/core/wiki/WikiInfo.tid
+++ /dev/null
@@ -1,6 +0,0 @@
-title: $:/WikiInfo
-
-* Tiddlers: <$count filter="[!is[system]]"/>
-* System tiddlers: <$count filter="[is[system]]"/>
-* Shadow tiddlers: <$count filter="[is[shadow]]"/>
-** Over-ridden shadow tiddlers: <$count filter="[!is[system]is[shadow]]"/>
diff --git a/core/wiki/tags/ControlPanel.tid b/core/wiki/tags/ControlPanel.tid
new file mode 100644
index 000000000..fdef2541f
--- /dev/null
+++ b/core/wiki/tags/ControlPanel.tid
@@ -0,0 +1,2 @@
+title: $:/tags/ControlPanel
+list: $:/core/ui/ControlPanel/Basics $:/core/ui/ControlPanel/Appearance $:/core/ui/ControlPanel/Encryption $:/core/ui/ControlPanel/Plugins $:/core/ui/ControlPanel/Internals
diff --git a/core/wiki/themeswitcher.tid b/core/wiki/themeswitcher.tid
index d3663d776..977e2bebf 100644
--- a/core/wiki/themeswitcher.tid
+++ b/core/wiki/themeswitcher.tid
@@ -3,15 +3,6 @@ title: $:/snippets/themeswitcher
 Current theme: {{$:/theme}}
 
 <$linkcatcher to="$:/theme">
-
-<$list filter="[plugin-type[theme]sort[title]]">
-
-<$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}>
-
-<$view field="name" format="text"/>
-
-</$link>
-
+<$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="name" format="text"/></$link></div>
 </$list>
-
 </$linkcatcher>
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
index 33e96477c..f99e44f42 100644
--- a/core/wiki/viewswitcher.tid
+++ b/core/wiki/viewswitcher.tid
@@ -2,12 +2,7 @@ title: $:/snippets/viewswitcher
 
 Current view: {{$:/view}}
 
-<$linkcatcher to="$:/view">
-
-<$list filter="classic zoomin pop">
-
-<$reveal state="$:/view" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/view" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="title"/></$link>
-
+<$linkcatcher to="$:/view"><$list filter="classic zoomin pop"><div><$reveal state="$:/view" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/view" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="title"/></$link>
+</div>
 </$list>
-
 </$linkcatcher>
diff --git a/editions/tw5.com/tiddlers/DeveloperDocs.tid b/editions/tw5.com/tiddlers/DeveloperDocs.tid
index b89b091be..646d6bf17 100644
--- a/editions/tw5.com/tiddlers/DeveloperDocs.tid
+++ b/editions/tw5.com/tiddlers/DeveloperDocs.tid
@@ -18,8 +18,6 @@ This is the developer documentation hub for TiddlyWiki.
 
 ! Internal Objects and Mechanisms
 
-{{mechanism}}
-
 <$list filter="[tag[mechanism]sort[title]]" type="ul"/>
 
 ! Module types
@@ -29,8 +27,6 @@ See SyncAdaptorModules.
 
 !! DeserializerModules
 
-Deserializers are modules that read tiddlers from different text formats:
-
-{{deserializers}}
+Deserializers are modules that load tiddlers from different text formats:
 
 <$list filter="[tag[deserializers]sort[title]]" type="ul"/>
diff --git a/themes/tiddlywiki/snowwhite/ThemeTweaks.tid b/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
index 969211e5f..b2f7c6b35 100644
--- a/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
+++ b/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
@@ -1,4 +1,6 @@
-title: $:/ControlPanel/ThemeTweaks
+title: $:/themes/tiddlywiki/snowwhite/themetweaks
+tags: $:/tags/ControlPanel
+caption: Theme Tweaks
 
 You can tweak certain aspects of the ''Snow White'' theme.
 
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index d939fdc73..aed1d5b1c 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -956,3 +956,15 @@ canvas.tw-edit-bitmapeditor  {
 	width: 1em;
 	height: 1em;
 }
+
+/*
+** Control panel
+*/
+
+.tw-control-panel td {
+	padding: 4px;
+}
+
+.tw-control-panel table, .tw-control-panel table input, .tw-control-panel table textarea {
+	width: 100%;
+}