diff --git a/core/ui/ControlPanel/Saving/DownloadSaver.tid b/core/ui/ControlPanel/Saving/DownloadSaver.tid
index 42e4dc3a9..be658a1ff 100644
--- a/core/ui/ControlPanel/Saving/DownloadSaver.tid
+++ b/core/ui/ControlPanel/Saving/DownloadSaver.tid
@@ -2,10 +2,19 @@ title: $:/core/ui/ControlPanel/Saving/DownloadSaver
tags: $:/tags/ControlPanel/Saving
caption: {{$:/language/ControlPanel/Saving/DownloadSaver/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Saving/DownloadSaver/
+
>>
+
<>
-!! <$link to="$:/config/DownloadSaver/AutoSave"><>$link>
+!!.tc-control-panel-accent <$link to="$:/config/DownloadSaver/AutoSave"><>$link>
-<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <> $checkbox>
+<$checkbox tiddler="$:/config/DownloadSaver/AutoSave"
+ field="text" checked="yes" unchecked="no" default="no"
+ class="tc-control-panel-item"
+>
+ <>
+$checkbox>
+
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Saving/General.tid b/core/ui/ControlPanel/Saving/General.tid
index d1b096281..38c3f34fb 100644
--- a/core/ui/ControlPanel/Saving/General.tid
+++ b/core/ui/ControlPanel/Saving/General.tid
@@ -3,14 +3,22 @@ tags: $:/tags/ControlPanel/Saving
caption: {{$:/language/ControlPanel/Saving/General/Caption}}
list-before:
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/
+>>
+
{{$:/language/ControlPanel/Saving/General/Hint}}
-!! <$link to="$:/config/AutoSave"><>$link>
+!!.tc-control-panel-accent <$link to="$:/config/AutoSave"><>$link>
<>
-<$radio tiddler="$:/config/AutoSave" value="yes"> <> $radio>
+<$radio tiddler="$:/config/AutoSave" value="yes">
+ <>
+$radio>
-<$radio tiddler="$:/config/AutoSave" value="no"> <> $radio>
+<$radio tiddler="$:/config/AutoSave" value="no">
+ <>
+$radio>
+
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Settings/CamelCase.tid b/core/ui/ControlPanel/Settings/CamelCase.tid
index 36377bb85..3feace84b 100644
--- a/core/ui/ControlPanel/Settings/CamelCase.tid
+++ b/core/ui/ControlPanel/Settings/CamelCase.tid
@@ -2,7 +2,16 @@ title: $:/core/ui/ControlPanel/Settings/CamelCase
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/CamelCase/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/CamelCase/
+
<>
-<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink" field="text" checked="enable" unchecked="disable" default="enable"> <$link to="$:/config/WikiParserRules/Inline/wikilink"><>$link> $checkbox>
+<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink"
+ field="text" checked="enable" unchecked="disable" default="enable"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/WikiParserRules/Inline/wikilink" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
diff --git a/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
index 47f277bd4..c3ad60aac 100644
--- a/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
@@ -2,13 +2,18 @@ caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
tags: $:/tags/ControlPanel/Settings
title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab
-\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
\whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
-<$link to="$:/config/DefaultMoreSidebarTab"><>$link>
+<$link to="$:/config/DefaultMoreSidebarTab" class="tc-control-panel-item">
+ <>
+$link>
-<$select tiddler="$:/config/DefaultMoreSidebarTab">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
-
-$list>
+<$select tiddler="$:/config/DefaultMoreSidebarTab" class="tc-select">
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
+
+ $list>
$select>
diff --git a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
index acd3421c7..1f4c5fc7b 100644
--- a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
@@ -5,10 +5,16 @@ title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
\define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/
\whitespace trim
-<$link to="$:/config/DefaultSidebarTab"><>$link>
+<$link to="$:/config/DefaultSidebarTab" class="tc-control-panel-item">
+ <>
+$link>
-<$select tiddler="$:/config/DefaultSidebarTab">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
-
-$list>
+<$select tiddler="$:/config/DefaultSidebarTab" class="tc-select">
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
+
+ $list>
$select>
diff --git a/core/ui/ControlPanel/Settings/EditorToolbar.tid b/core/ui/ControlPanel/Settings/EditorToolbar.tid
index aa142bf62..ad7384568 100644
--- a/core/ui/ControlPanel/Settings/EditorToolbar.tid
+++ b/core/ui/ControlPanel/Settings/EditorToolbar.tid
@@ -2,8 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/EditorToolbar
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/EditorToolbar/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/EditorToolbar/
<>
-<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><>$link> $checkbox>
-
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar"
+ field="text" checked="yes" unchecked="no" default="yes"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/TextEditor/EnableToolbar" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
diff --git a/core/ui/ControlPanel/Settings/InfoPanelMode.tid b/core/ui/ControlPanel/Settings/InfoPanelMode.tid
index 371b6d61b..e539b8f82 100644
--- a/core/ui/ControlPanel/Settings/InfoPanelMode.tid
+++ b/core/ui/ControlPanel/Settings/InfoPanelMode.tid
@@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/InfoPanelMode
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/InfoPanelMode/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/InfoPanelMode/
-<$link to="$:/config/TiddlerInfo/Mode"><>$link>
-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <> $radio>
+<$link to="$:/config/TiddlerInfo/Mode" class="tc-control-panel-item">
+ <>
+$link>
-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <> $radio>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup">
+ <>
+$radio>
+
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky">
+ <>
+$radio>
diff --git a/core/ui/ControlPanel/Settings/LinkToBehaviour.tid b/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
index 92d46601e..dc98b1ae6 100644
--- a/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
+++ b/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
@@ -2,21 +2,25 @@ title: $:/core/ui/ControlPanel/Settings/LinkToBehaviour
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/LinkToBehaviour/Caption}}
-\define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
\whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
-<$link to="$:/config/Navigation/openLinkFromInsideRiver"><>$link>
+<$link to="$:/config/Navigation/openLinkFromInsideRiver" class="tc-control-panel-item">
+ <>
+$link>
-<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver">
-
-
-
-
+<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver" class="tc-select">
+
+
+
+
$select>
-<$link to="$:/config/Navigation/openLinkFromOutsideRiver"><>$link>
+<$link to="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-control-panel-item">
+ <>
+$link>
-<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver">
-
-
+<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-select">
+
+
$select>
diff --git a/core/ui/ControlPanel/Settings/MissingLinks.tid b/core/ui/ControlPanel/Settings/MissingLinks.tid
index 4a7ba5f2e..e0149c9a1 100644
--- a/core/ui/ControlPanel/Settings/MissingLinks.tid
+++ b/core/ui/ControlPanel/Settings/MissingLinks.tid
@@ -2,8 +2,12 @@ title: $:/core/ui/ControlPanel/Settings/MissingLinks
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/MissingLinks/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/MissingLinks/
<>
-<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/MissingLinks"><>$link> $checkbox>
-
+<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes">
+ <$link to="$:/config/MissingLinks" class="tc-control-panel-item">
+ <>
+ $link>
+$checkbox>
diff --git a/core/ui/ControlPanel/Settings/NavigationAddressBar.tid b/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
index 4a123ba99..f35f8a1f1 100644
--- a/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
+++ b/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
@@ -2,12 +2,21 @@ title: $:/core/ui/ControlPanel/Settings/NavigationAddressBar
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/NavigationAddressBar/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/NavigationAddressBar/
-<$link to="$:/config/Navigation/UpdateAddressBar"><>$link>
+<$link to="$:/config/Navigation/UpdateAddressBar" class="tc-control-panel-item">
+ <>
+$link>
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview"> <> $radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview">
+ <>
+$radio>
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink"> <> $radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink">
+ <>
+$radio>
-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no"> <> $radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no">
+ <>
+$radio>
diff --git a/core/ui/ControlPanel/Settings/NavigationHistory.tid b/core/ui/ControlPanel/Settings/NavigationHistory.tid
index af63de1ee..bd118a103 100644
--- a/core/ui/ControlPanel/Settings/NavigationHistory.tid
+++ b/core/ui/ControlPanel/Settings/NavigationHistory.tid
@@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/NavigationHistory
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/NavigationHistory/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/NavigationHistory/
-<$link to="$:/config/Navigation/UpdateHistory"><>$link>
-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <> $radio>
+<$link to="$:/config/Navigation/UpdateHistory" class="tc-control-panel-item">
+ <>
+$link>
-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <> $radio>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes">
+ <>
+$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no">
+ <>
+$radio>
diff --git a/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid b/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
index 5a496d5e1..6c15936e7 100644
--- a/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
+++ b/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
@@ -2,9 +2,24 @@ title: $:/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/NavigationPermalinkviewMode/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/NavigationPermalinkviewMode/
<>
-<$checkbox tiddler="$:/config/Navigation/Permalinkview/CopyToClipboard" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Navigation/Permalinkview/CopyToClipboard"><>$link> $checkbox>
+<$checkbox tiddler="$:/config/Navigation/Permalinkview/CopyToClipboard"
+ field="text" checked="yes" unchecked="no" default="yes"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/Navigation/Permalinkview/CopyToClipboard" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
-<$checkbox tiddler="$:/config/Navigation/Permalinkview/UpdateAddressBar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Navigation/Permalinkview/UpdateAddressBar"><>$link> $checkbox>
+<$checkbox tiddler="$:/config/Navigation/Permalinkview/UpdateAddressBar"
+ field="text" checked="yes" unchecked="no" default="yes"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/Navigation/Permalinkview/UpdateAddressBar" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
diff --git a/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid b/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
index b3d1d9763..1ea9061ae 100644
--- a/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
+++ b/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
@@ -2,7 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/PerformanceInstrumentation
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/PerformanceInstrumentation/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/PerformanceInstrumentation/
<>
-<$checkbox tiddler="$:/config/Performance/Instrumentation" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Performance/Instrumentation"><>$link> $checkbox>
+<$checkbox tiddler="$:/config/Performance/Instrumentation"
+ field="text" checked="yes" unchecked="no" default="no"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/Performance/Instrumentation" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
diff --git a/core/ui/ControlPanel/Settings/TitleLinks.tid b/core/ui/ControlPanel/Settings/TitleLinks.tid
index c1acdc7bd..1620dfe39 100644
--- a/core/ui/ControlPanel/Settings/TitleLinks.tid
+++ b/core/ui/ControlPanel/Settings/TitleLinks.tid
@@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/TitleLinks
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/TitleLinks/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/TitleLinks/
-<$link to="$:/config/Tiddlers/TitleLinks"><>$link>
-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <> $radio>
+<$link to="$:/config/Tiddlers/TitleLinks" class="tc-control-panel-item">
+ <>
+$link>
-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <> $radio>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes">
+ <>
+$radio>
+
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no">
+ <>
+$radio>
diff --git a/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid b/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
index a25b2a39e..c02d653d7 100644
--- a/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
+++ b/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
@@ -2,12 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtonStyle
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/ToolbarButtonStyle/Caption}}
-\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
\whitespace trim
-<$link to="$:/config/Toolbar/ButtonClass"><>$link>
+\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
-<$select tiddler="$:/config/Toolbar/ButtonClass">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
-
-$list>
+<$link to="$:/config/Toolbar/ButtonClass" class="tc-control-panel-item">
+ <>
+$link>
+
+<$select tiddler="$:/config/Toolbar/ButtonClass" class="tc-select">
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
+
+ $list>
$select>
diff --git a/core/ui/ControlPanel/Settings/ToolbarButtons.tid b/core/ui/ControlPanel/Settings/ToolbarButtons.tid
index 00bdb191e..d76394ee8 100644
--- a/core/ui/ControlPanel/Settings/ToolbarButtons.tid
+++ b/core/ui/ControlPanel/Settings/ToolbarButtons.tid
@@ -2,9 +2,24 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtons
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/ToolbarButtons/Caption}}
+\whitespace trim
\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtons/
<>
-<$checkbox tiddler="$:/config/Toolbar/Icons" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Toolbar/Icons"><>$link> $checkbox>
+<$checkbox tiddler="$:/config/Toolbar/Icons"
+ field="text" checked="yes" unchecked="no" default="yes"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/Toolbar/Icons" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
-<$checkbox tiddler="$:/config/Toolbar/Text" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Toolbar/Text"><>$link> $checkbox>
+<$checkbox tiddler="$:/config/Toolbar/Text"
+ field="text" checked="yes" unchecked="no" default="no"
+ class="tc-control-panel-item"
+>
+ <$link to="$:/config/Toolbar/Text" class="tc-tiny-gap-left">
+ <>
+ $link>
+$checkbox>
diff --git a/core/ui/ControlPanel/TiddlyWiki.tid b/core/ui/ControlPanel/TiddlyWiki.tid
index 40be32139..ca3c88831 100644
--- a/core/ui/ControlPanel/TiddlyWiki.tid
+++ b/core/ui/ControlPanel/TiddlyWiki.tid
@@ -9,9 +9,9 @@ list-before:
<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
-
+
> style="border-top:1px solid #eee;">
-!! <$link><$transclude field="caption"/>$link>
+!!.tc-control-panel-accent <$link><$transclude field="caption"/>$link>
<$transclude/>