diff --git a/core/language/en-GB/ControlPanel.tids b/core/language/en-GB/ControlPanel.tids
index 234f6a892..449e8ea5f 100644
--- a/core/language/en-GB/ControlPanel.tids
+++ b/core/language/en-GB/ControlPanel.tids
@@ -16,10 +16,11 @@ Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers:
Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers:
Basics/Language/Prompt: Hello! Current language:
Appearance/Caption: Appearance
-Appearance/Theme/Caption: Current theme:
-Appearance/Theme/Heading: Theme
-Appearance/StoryView/Caption: Current view:
-Appearance/StoryView/Heading: Story View
+Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
+Appearance/Theme/Prompt: Current theme:
+Appearance/Theme/Caption: Theme
+Appearance/StoryView/Prompt: Current view:
+Appearance/StoryView/Caption: Story View
Saving/Caption: Saving
Saving/Heading: Saving
Saving/AutoSave: Autosave
@@ -54,8 +55,9 @@ Tools/Encryption/Disabled/Prompt: This wiki is not encrypted
Tools/Encryption/ClearPassword/Button: clear password
Tools/Encryption/ChangePassword/Button: change password
Tools/Encryption/SetPassword/Button: set password
-Internals/Caption: Internals
-Internals/TiddlerFields/Heading: TiddlerFields
-Internals/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
-Internals/LoadedModules/Heading: Loaded Modules
-Internals/LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
+Advanced/Caption: Advanced
+Advanced/Hint: Internal information about this TiddlyWiki
+Advanced/TiddlerFields/Caption: Tiddler Fields
+Advanced/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+Advanced/LoadedModules/Caption: Loaded Modules
+Advanced/LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid
new file mode 100644
index 000000000..9ba7e742e
--- /dev/null
+++ b/core/ui/ControlPanel/Advanced.tid
@@ -0,0 +1,7 @@
+title: $:/core/ui/ControlPanel/Advanced
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/Advanced/Caption}}
+
+{{$:/language/ControlPanel/Advanced/Hint}}
+
+
<>
diff --git a/core/ui/ControlPanel/Advanced/LoadedModules.tid b/core/ui/ControlPanel/Advanced/LoadedModules.tid
new file mode 100644
index 000000000..dfa424424
--- /dev/null
+++ b/core/ui/ControlPanel/Advanced/LoadedModules.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/ControlPanel/Advanced/LoadedModules
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Advanced/LoadedModules/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Advanced/
+<>
+
+{{$:/snippets/modules}}
diff --git a/core/ui/ControlPanel/Advanced/TiddlerFields.tid b/core/ui/ControlPanel/Advanced/TiddlerFields.tid
new file mode 100644
index 000000000..85192bec3
--- /dev/null
+++ b/core/ui/ControlPanel/Advanced/TiddlerFields.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Advanced/TiddlerFields
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Advanced/TiddlerFields/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Advanced/
+
+<>
+
+{{$:/snippets/allfields}}
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
index ece52cc6c..2c424ac6a 100644
--- a/core/ui/ControlPanel/Appearance.tid
+++ b/core/ui/ControlPanel/Appearance.tid
@@ -2,11 +2,6 @@ title: $:/core/ui/ControlPanel/Appearance
tags: $:/tags/ControlPanel
caption: {{$:/language/ControlPanel/Appearance/Caption}}
-\define lingo-base() $:/language/ControlPanel/Appearance/
-! <>
+{{$:/language/ControlPanel/Appearance/Hint}}
-{{$:/snippets/themeswitcher}}
-
-! <>
-
-{{$:/snippets/viewswitcher}}
+<>
diff --git a/core/ui/ControlPanel/Appearance/StoryView.tid b/core/ui/ControlPanel/Appearance/StoryView.tid
new file mode 100644
index 000000000..e2d1b06c2
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance/StoryView.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Appearance/StoryView
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/StoryView/Caption}}
+
+{{$:/snippets/viewswitcher}}
diff --git a/core/ui/ControlPanel/Appearance/Theme.tid b/core/ui/ControlPanel/Appearance/Theme.tid
new file mode 100644
index 000000000..bf7d2538d
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance/Theme.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Appearance/Theme
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/Theme/Caption}}
+
+{{$:/snippets/themeswitcher}}
diff --git a/core/ui/ControlPanel/Internals.tid b/core/ui/ControlPanel/Internals.tid
deleted file mode 100644
index e9779254f..000000000
--- a/core/ui/ControlPanel/Internals.tid
+++ /dev/null
@@ -1,16 +0,0 @@
-title: $:/core/ui/ControlPanel/Internals
-tags: $:/tags/ControlPanel
-caption: {{$:/language/ControlPanel/Internals/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/Internals/
-! <>
-
-<>
-
-{{$:/snippets/allfields}}
-
-! <>
-
-<>
-
-{{$:/snippets/modules}}
diff --git a/core/wiki/minithemeswitcher.tid b/core/wiki/minithemeswitcher.tid
index 787329a5a..efe20d8dd 100644
--- a/core/wiki/minithemeswitcher.tid
+++ b/core/wiki/minithemeswitcher.tid
@@ -1,7 +1,7 @@
title: $:/snippets/minithemeswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
-<> <$view tiddler={{$:/theme}} field="name"/>
+<> <$view tiddler={{$:/theme}} field="name"/>
<$linkcatcher to="$:/theme">
<$list filter="[plugin-type[theme]sort[title]]"><$reveal state="$:/theme" type="match" text={{!!title}}>•$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}> $reveal> <$link to={{!!title}}><$view field="name" format="text"/>$link>
diff --git a/core/wiki/themeswitcher.tid b/core/wiki/themeswitcher.tid
index 4f1e24830..435d5d49f 100644
--- a/core/wiki/themeswitcher.tid
+++ b/core/wiki/themeswitcher.tid
@@ -1,7 +1,7 @@
title: $:/snippets/themeswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
-<> <$view tiddler={{$:/theme}} field="name"/>
+<> <$view tiddler={{$:/theme}} field="name"/>
<$linkcatcher to="$:/theme">
<$list filter="[plugin-type[theme]sort[title]]"><$reveal state="$:/theme" type="match" text={{!!title}}>•$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}> $reveal> <$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/>$link>
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
index ce047c204..7e8799fe3 100644
--- a/core/wiki/viewswitcher.tid
+++ b/core/wiki/viewswitcher.tid
@@ -1,7 +1,7 @@
title: $:/snippets/viewswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/StoryView/
-<> {{$:/view}}
+<> {{$:/view}}
<$linkcatcher to="$:/view"><$list filter="classic zoomin pop"><$reveal state="$:/view" type="match" text={{!!title}}>•$reveal><$reveal state="$:/view" type="nomatch" text={{!!title}}> $reveal> <$link to={{!!title}}><$view field="title"/>$link>
diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
index 4e3f83432..66878c823 100644
--- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid
+++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/vanilla/themetweaks
-tags: $:/tags/ControlPanel
+tags: $:/tags/ControlPanel/Appearance
caption: Theme Tweaks
You can tweak certain aspects of the ''Vanilla'' theme.