diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid
index 7e78f2037..39430965a 100644
--- a/core/wiki/ControlPanel.tid
+++ b/core/wiki/ControlPanel.tid
@@ -1,41 +1,31 @@
 title: $:/ControlPanel
 
-! Configuration tiddlers
+''Initial setup''
 
-* [[Title of this TiddlyWiki|SiteTitle]]: <$edit tiddler="SiteTitle" default="" type="input"/>
+:[[Title of this TiddlyWiki|SiteTitle]]: <$edit tiddler="SiteTitle" default="" type="input"/>
 
-* [[Subtitle|SiteSubtitle]]: <$edit tiddler="SiteSubtitle" default="" type="input"/>
+:[[Subtitle|SiteSubtitle]]: <$edit tiddler="SiteSubtitle" default="" type="input"/>
 
-* [[Username for signing edits|$:/status/UserName]]: <$edit tiddler="$:/status/UserName" default="" type="input"/>
+:[[Username for signing edits|$:/status/UserName]]: <$edit tiddler="$:/status/UserName" default="" type="input"/>
 
-* [[Animation duration|$:/config/AnimationDuration]]: <$edit tiddler="$:/config/AnimationDuration" default="" type="input"/>
+:[[Animation duration|$:/config/AnimationDuration]]: <$edit tiddler="$:/config/AnimationDuration" default="" type="input"/><br><br>
+:Edit [[DefaultTiddlers|$:/DefaultTiddlers]] to choose which tiddlers are displayed at startup
 
-* Edit [[DefaultTiddlers|$:/DefaultTiddlers]] to choose which tiddlers are displayed at startup
+:{{$:/snippets/encryptionstatus}}
 
-! Import tiddlers
+''Add plugins and tiddlers to your ~TiddlyWiki''
 
-Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately).
+:Go to our [[TiddlerMall]] for our growing collection of plugins, themes and more<br><br>
+:Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). <$import class="tw-drop-zone"/>
 
-<$import class="tw-drop-zone"/>
+''Visual appearance''
 
-! Save changes
+*{{$:/snippets/viewswitcher}}
+*{{$:/snippets/themeswitcher}}
+*Edit [[ThemeTweaks|$:/ControlPanel/ThemeTweaks]] to change the appearance of your ~TiddlyWiki
 
-<$button message="tw-save-wiki" class="btn btn-primary">Save Changes</$button>
+''Additional information about this ~TiddlyWiki''
 
-! Encryption
-
-The tiddlers in TiddlyWiki documents can be securely encrypted by specifying a password before saving changes.
-
-{{$:/snippets/encryptionstatus}}
-
-! Theme
-
-{{$:/snippets/themeswitcher}}
-
-[[Theme tweaks|$:/ControlPanel/ThemeTweaks]]
-
-{{$:/core/ui/ServerControlPanel}}
-
-! Advanced
-
-[[Internal configuration information|$:/ConfigInfo]]
+*~TiddlyWiki5 version <$version/>
+*[[Wiki Info|$:/WikiInfo]]
+*[[Internal configuration information|$:/ConfigInfo]]
diff --git a/themes/tiddlywiki/snowwhite/ThemeTweaks.tid b/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
index fa49ad751..4920b585b 100644
--- a/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
+++ b/themes/tiddlywiki/snowwhite/ThemeTweaks.tid
@@ -2,7 +2,7 @@ title: $:/ControlPanel/ThemeTweaks
 
 You can tweak certain aspects of the ''Snow White'' theme.
 
-//Currently, you need to ''save and restart'' TiddlyWiki before these changes take effect//
+//Currently, you need to ''save and restart'' TiddlyWiki before these changes take effect. Also take care to preserve any backticks (&#96;) in the settings//
 
 ! Colours
 
@@ -26,9 +26,9 @@ You can tweak certain aspects of the ''Snow White'' theme.
 
 * Font size: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="fontsize" default="" type="input"/>
 * Line height: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="lineheight" default="" type="input"/>
-* Story left position: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storyleft" default="" type="input"/>
-* Story top position: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storytop" default="" type="input"/>
-* Story right: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storyright" default="" type="input"/>
-* Story width: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storywidth" default="" type="input"/>
 
+* Story left position //(the distance between the left of the screen and the left margin of the story river or tiddler area)//: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storyleft" default="" type="input"/>
+* Story top position //(the distance between the top of the screen ad the top margin of the story river or tiddler area)//: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storytop" default="" type="input"/>
+* Story right //(the distance between the left side of the screen and the left margin of the sidebar area)//: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storyright" default="" type="input"/>
+* Story width //(the width of the story river or tiddler area)//: <$edit tiddler="$:/themes/tiddlywiki/snowwhite/metrics" index="storywidth" default="" type="input"/>