diff --git a/core/ui/ControlPanel/Settings.tid b/core/ui/ControlPanel/Settings.tid
index f4a4b13c2..74004ffa0 100644
--- a/core/ui/ControlPanel/Settings.tid
+++ b/core/ui/ControlPanel/Settings.tid
@@ -2,18 +2,6 @@ title: $:/core/ui/ControlPanel/Settings
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Settings/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Settings/
-
-<<lingo Hint>>
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
-
-<div style="border-top:1px solid #eee;">
-
-!! <$link><$transclude field="caption"/></$link>
-
-<$transclude/>
-
-</div>
-
-</$list>
+<div class="tc-control-panel">
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" default="$:/core/ui/ControlPanel/Settings/TiddlyWiki" explicitState="$:/state/tab--697582678"/>
+</div>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid b/core/ui/ControlPanel/TiddlyWiki.tid
similarity index 96%
rename from plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid
rename to core/ui/ControlPanel/TiddlyWiki.tid
index f88865997..40be32139 100644
--- a/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid
+++ b/core/ui/ControlPanel/TiddlyWiki.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/ControlPanel/Settings/TiddlyWiki
 tags: $:/tags/ControlPanel/SettingsTab
 caption: TiddlyWiki
+list-before:
 
 \define lingo-base() $:/language/ControlPanel/Settings/
 
diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid b/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid
deleted file mode 100644
index 1efe8b867..000000000
--- a/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid
+++ /dev/null
@@ -1,7 +0,0 @@
-title: $:/core/ui/ControlPanel/Settings
-tags: $:/tags/ControlPanel
-caption: {{$:/language/ControlPanel/Settings/Caption}}
-
-<div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" default="$:/core/ui/ControlPanel/Settings/TiddlyWiki" explicitState="$:/state/tab--697582678"/>
-</div>