diff --git a/core/language/en-GB/ControlPanel.tids b/core/language/en-GB/ControlPanel.tids
index 7652c313b..298df8869 100644
--- a/core/language/en-GB/ControlPanel.tids
+++ b/core/language/en-GB/ControlPanel.tids
@@ -14,5 +14,35 @@ Basics/Tags: Number of tags
 Basics/SystemTiddlers: Number of system tiddlers
 Basics/ShadowTiddlers: Number of shadow tiddlers
 Basics/OverriddenShadowTiddlers: Number of overridden shadow tiddlers
+Basics/Language/Prompt: Hello! Current language:
 Appearance/Caption: Appearance
-Language/prompt: Hello! Current language:
+Appearance/Theme/Heading: Theme
+Appearance/StoryView/Heading: Story View
+Saving/Caption: Saving
+Saving/Heading: Saving
+Saving/AutoSave: Auto Save
+Saving/TiddlySpot/Heading: ~TiddlySpot
+Saving/TiddlySpot/UserName: Wiki Name
+Saving/TiddlySpot/Password: Password
+Saving/TiddlySpot/Backups: Backups
+Saving/TiddlySpot/Advanced/Heading: Advanced Settings
+Saving/TiddlySpot/ServerURL: Server URL
+Saving/TiddlySpot/Filename: Upload Filename
+Saving/TiddlySpot/UploadDir: Upload Directory
+Saving/TiddlySpot/BackupDir: Backup Directory
+Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address//
+Plugins/Caption: Plugins
+Plugins/Fields/Title: Title
+Plugins/Fields/Description: Description
+Plugins/Fields/Version: Version
+Tools/Caption: Tools
+Tools/Import/Heading: Import
+Tools/Import/Hint: Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window.
+Tools/Export/Heading: Export
+Tools/Export/AllAsStaticHTML/Caption: Download all tiddlers as static HTML
+Tools/Encryption/Heading: Encryption
+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.
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
index 40bead91c..ece52cc6c 100644
--- a/core/ui/ControlPanel/Appearance.tid
+++ b/core/ui/ControlPanel/Appearance.tid
@@ -1,11 +1,12 @@
 title: $:/core/ui/ControlPanel/Appearance
 tags: $:/tags/ControlPanel
-caption: Appearance
+caption: {{$:/language/ControlPanel/Appearance/Caption}}
 
-! Theme
+\define lingo-base() $:/language/ControlPanel/Appearance/
+! <<lingo Theme/Heading>>
 
 {{$:/snippets/themeswitcher}}
 
-! Story View
+! <<lingo StoryView/Heading>>
 
 {{$:/snippets/viewswitcher}}
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index b53be5730..225800d42 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -2,16 +2,16 @@ title: $:/core/ui/ControlPanel/Basics
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Basics/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/
-|<<lingo Basics/Version>> |''<<version>>'' |
-|<$link to="SiteTitle"><<lingo Basics/Title>></$link> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
-|<$link to="SiteSubtitle"><<lingo Basics/Subtitle>></$link> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/status/UserName"><<lingo Basics/Username>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
-|<$link to="$:/config/AnimationDuration"><<lingo Basics/AnimDuration>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo Basics/DefaultTiddlers>></$link> |<<lingo Basics/DefaultTiddlers/Prompt>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo Basics/DefaultTiddlers/Hint>>// |
-|{{$:/language/ControlPanel/Language/prompt}} |{{$:/snippets/minilanguageswitcher}} |
-|<<lingo Basics/Tiddlers>> |''<$count filter="[!is[system]]"/>'' |
-|<<lingo Basics/Tags>> |''<$count filter="[tags[]]"/>'' |
-|<<lingo Basics/SystemTiddlers>> |''<$count filter="[is[system]]"/>'' |
-|<<lingo Basics/ShadowTiddlers>> |''<$count filter="[is[shadow]]"/>'' |
-|<<lingo Basics/OverriddenShadowTiddlers>> |''<$count filter="[!is[system]is[shadow]]"/>'' |
+\define lingo-base() $:/language/ControlPanel/Basics/
+|<<lingo Version>> |''<<version>>'' |
+|<$link to="SiteTitle"><<lingo Title>></$link> |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
+|<$link to="SiteSubtitle"><<lingo Subtitle>></$link> |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/status/UserName"><<lingo Username>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
+|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers>></$link> |<<lingo DefaultTiddlers/Prompt>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/Hint>>// |
+|<<lingo Language/Prompt>>s |{{$:/snippets/minilanguageswitcher}} |
+|<<lingo Tiddlers>> |''<$count filter="[!is[system]]"/>'' |
+|<<lingo Tags>> |''<$count filter="[tags[]]"/>'' |
+|<<lingo SystemTiddlers>> |''<$count filter="[is[system]]"/>'' |
+|<<lingo ShadowTiddlers>> |''<$count filter="[is[shadow]]"/>'' |
+|<<lingo OverriddenShadowTiddlers>> |''<$count filter="[!is[system]is[shadow]]"/>'' |
diff --git a/core/ui/ControlPanel/Internals.tid b/core/ui/ControlPanel/Internals.tid
index e4f6d0a1b..e9779254f 100644
--- a/core/ui/ControlPanel/Internals.tid
+++ b/core/ui/ControlPanel/Internals.tid
@@ -1,15 +1,16 @@
 title: $:/core/ui/ControlPanel/Internals
 tags: $:/tags/ControlPanel
-caption: Internals
+caption: {{$:/language/ControlPanel/Internals/Caption}}
 
-! Tiddler fields
+\define lingo-base() $:/language/ControlPanel/Internals/
+! <<lingo TiddlerFields/Heading>>
 
-This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+<<lingo TiddlerFields/Hint>>
 
 {{$:/snippets/allfields}}
 
-! Loaded Modules
+! <<lingo LoadedModules/Heading>>
 
-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.
+<<lingo LoadedModules/Hint>>
 
 {{$:/snippets/modules}}
diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid
index 58655c0dc..0c13d738c 100644
--- a/core/ui/ControlPanel/Plugins.tid
+++ b/core/ui/ControlPanel/Plugins.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ControlPanel/Plugins
 tags: $:/tags/ControlPanel
-caption: Plugins
+caption: {{$:/language/ControlPanel/Plugins/Caption}}
 
-<table><tbody><tr><th>Title</th><th>Description</th><th>Version</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><td><$view field="version"/></td></tr></$list>
+\define lingo-base() $:/language/ControlPanel/Plugins/
+<table><tbody><tr><th><<lingo Fields/Title>></th><th><<lingo Fields/Description>></th><th><<lingo Fields/Version>></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><td><$view field="version"/></td></tr></$list>
 </tbody>
 </table>
diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid
index ac30498e5..d17e7a208 100644
--- a/core/ui/ControlPanel/Saving.tid
+++ b/core/ui/ControlPanel/Saving.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ControlPanel/Saving
 tags: $:/tags/ControlPanel
-caption: Saving
+caption: {{$:/language/ControlPanel/Saving/Caption}}
 
+\define lingo-base() $:/language/ControlPanel/Saving/
 \define backupURL()
 http://$(userName)$.tiddlyspot.com/backup/
 \end
@@ -12,23 +13,22 @@ http://$(userName)$.tiddlyspot.com/backup/
 </$set>
 </$reveal>
 \end
-! Saving
+! <<lingo Saving/Heading>>
 
-|[[Autosave|$:/config/AutoSave]] |{{$:/snippets/autosavestatus}} |
+|<<lingo AutoSave>> |{{$:/snippets/autosavestatus}} |
 
+! <<lingo TiddlySpot/Heading>>
 
-! TiddlySpot
+|<<lingo TiddlySpot/UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
+|<<lingo TiddlySpot/Password>> |<$password name="upload"/> |
+|<<lingo TiddlySpot/Backups>> |<<backupLink>> |
 
-|[[Wiki name|$:/UploadName]] |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
-|Password |<$password name="upload"/> |
-|Backups |<<backupLink>> |
+!! <<lingo TiddlySpot/Advanced/Heading>>
 
-!! Advanced settings
+|<<lingo TiddlySpot/ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
+|<<lingo TiddlySpot/Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |
+|<<lingo TiddlySpot/UploadDir>> |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> |
+|<<lingo TiddlySpot/BackupDir>> |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> |
 
-|Server URL |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
-|Upload filename |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |
-|Upload directory |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> |
-|Backup directory |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> |
+<<lingo TiddlySpot/Hint>>
 
-
-//The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address//
diff --git a/core/ui/ControlPanel/Tools.tid b/core/ui/ControlPanel/Tools.tid
index 4a190e46e..48b131056 100644
--- a/core/ui/ControlPanel/Tools.tid
+++ b/core/ui/ControlPanel/Tools.tid
@@ -1,17 +1,18 @@
 title: $:/core/ui/ControlPanel/Tools
 tags: $:/tags/ControlPanel
-caption: Tools
+caption: {{$:/language/ControlPanel/Tools/Caption}}
 
-! Import
+\define lingo-base() $:/language/ControlPanel/Tools/
+! <<lingo Import/Heading>>
 
 <$browse/>
 
-Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window.
+<<lingo Import/Hint>>
 
-! Export
+! <<lingo Export/Heading>>
 
-<$button message="tw-download-file" param="$:/core/templates/alltiddlers.template.html" class="btn-big-green">Download all tiddlers as static HTML {{$:/core/images/save-button}}</$button>
+<$button message="tw-download-file" param="$:/core/templates/alltiddlers.template.html" class="btn-big-green"><<lingo Export/AllAsStaticHTML/Caption>> {{$:/core/images/save-button}}</$button>
 
-! Encryption
+! <<lingo Encryption/Heading>>
 
 {{$:/snippets/encryptionstatus}}
diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
index 2c99e0b29..d2abdfd89 100644
--- a/core/wiki/languageswitcher.tid
+++ b/core/wiki/languageswitcher.tid
@@ -1,6 +1,6 @@
 title: $:/snippets/languageswitcher
 
-{{$:/language/ControlPanel/Language/prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/></$view></$view>
+{{$:/language/ControlPanel/Basics/Language/Prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/></$view></$view>
 
 <$linkcatcher to="$:/language">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]"><div><$reveal state="$:/language" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/language" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/></$view></$view></$link></div>
diff --git a/languages/de-AT/ControlPanel.tids b/languages/de-AT/ControlPanel.tids
index 71a07f53e..57f9075a7 100644
--- a/languages/de-AT/ControlPanel.tids
+++ b/languages/de-AT/ControlPanel.tids
@@ -1,3 +1,3 @@
 title: $:/language/ControlPanel/
 
-Language/prompt: Hallo! Aktuelle Sprache:
+Basics/Language/Prompt: Hallo! Aktuelle Sprache:
diff --git a/languages/en-US/ControlPanel.tids b/languages/en-US/ControlPanel.tids
index a52ab1787..908d0da32 100644
--- a/languages/en-US/ControlPanel.tids
+++ b/languages/en-US/ControlPanel.tids
@@ -1,3 +1,3 @@
 title: $:/language/ControlPanel/
 
-Language/prompt: Hiya! Current language:
+Basics/Language/Prompt: Hiya! Current language:
diff --git a/languages/fr-FR/ControlPanel.tids b/languages/fr-FR/ControlPanel.tids
index d487efacf..1509c289f 100644
--- a/languages/fr-FR/ControlPanel.tids
+++ b/languages/fr-FR/ControlPanel.tids
@@ -1,3 +1,3 @@
 title: $:/language/ControlPanel/
 
-Language/prompt: Bonjour! Langage courant:
+Basics/Language/Prompt: Bonjour! Langage courant: