diff --git a/core/palettes/Contrast.tid b/core/palettes/Contrast.tid
new file mode 100644
index 000000000..fd14b32cf
--- /dev/null
+++ b/core/palettes/Contrast.tid
@@ -0,0 +1,80 @@
+title: $:/palettes/Contrast
+name: Contrast
+description: High contrast and unambiguous
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+
+alert-background: #ffe476
+alert-border: #b99e2f
+alert-highlight: #881122
+alert-muted-foreground: #b99e2f
+background: #ffffff
+blockquote-bar: <<colour muted-foreground>>
+code-background: #f7f7f9
+code-border: #e1e1e8
+code-foreground: #dd1144
+download-background: #34c734
+download-foreground: <<colour background>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: #fff
+dropdown-tab-background: #ececec
+dropzone-background: rgba(0,200,0,0.7)
+foreground: #333333
+message-background: #ecf2ff
+message-border: #cfd6e6
+message-foreground: #547599
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: #999999
+modal-footer-background: #f5f5f5
+modal-footer-border: #dddddd
+modal-header-border: #eeeeee
+muted-foreground: #999999
+notification-background: #ffffdd
+notification-border: #999999
+page-background: #000000
+pre-background: #f5f5f5
+pre-border: #cccccc
+primary: #5778d8
+sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground: #ffffff
+sidebar-foreground: #ffffff
+sidebar-foreground-shadow: rgba(255,0,0, 0.5)
+sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground: #c0c0c0
+sidebar-tab-background-selected: #ececec
+sidebar-tiddler-link-foreground-hover: #444444
+sidebar-tiddler-link-foreground: #999999
+static-alert-foreground: #aaaaaa
+tab-background-selected: #ffffff
+tab-background: #d8d8d8
+tab-border-selected: #d8d8d8
+tab-border: #cccccc
+tab-divider: #d8d8d8
+tab-foreground: #666666
+table-border: #dddddd
+table-footer-background: #a8a8a8
+table-header-background: #f0f0f0
+tag-background: #d5ad34
+tag-foreground: #ffffff
+tiddler-background: <<colour background>>
+tiddler-controls-foreground-hover: #888888
+tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground: #cccccc
+tiddler-editor-background: #f8f8f8
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-background: #f8f8f8
+tiddler-info-border: #dddddd
+tiddler-info-tab-background: #f8f8f8
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: #c0c0c0
+tiddler-title-foreground: #182955
+untagged-background: #999999
+very-muted-foreground: #888888
diff --git a/core/palettes/Sky.tid b/core/palettes/Sky.tid
index cc1ef7dce..389e60fba 100644
--- a/core/palettes/Sky.tid
+++ b/core/palettes/Sky.tid
@@ -39,18 +39,19 @@ notification-border: #999999
 page-background: #ececfc
 pre-background: #f5f5f5
 pre-border: #cccccc
-primary: #5778d8
+primary: #d8b757
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ffffff
 sidebar-foreground: #acacac
+sidebar-foreground-shadow: rgba(255,255,255, 0.8)
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: #c0c0c0
-sidebar-tab-background-selected: #ececec
+sidebar-tab-background-selected: <<colour page-background>>
 sidebar-tiddler-link-foreground-hover: #444444
 sidebar-tiddler-link-foreground: #999999
 static-alert-foreground: #aaaaaa
-tab-background-selected: #ffffff
-tab-background: #d8d8d8
+tab-background-selected: <<colour background>>
+tab-background: #bad0f1
 tab-border-selected: #d8d8d8
 tab-border: #cccccc
 tab-divider: #d8d8d8
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
index c31e4850d..a2651ef7a 100644
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -42,6 +42,7 @@ primary: #5778d8
 sidebar-controls-foreground-hover: #000000
 sidebar-controls-foreground: #ffffff
 sidebar-foreground: #acacac
+sidebar-foreground-shadow: rgba(255,255,255, 0.8)
 sidebar-muted-foreground-hover: #444444
 sidebar-muted-foreground: #c0c0c0
 sidebar-tab-background-selected: #ececec
diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid
index 250490249..7014f7099 100644
--- a/core/ui/PageStylesheet.tid
+++ b/core/ui/PageStylesheet.tid
@@ -1,5 +1,52 @@
 title: $:/core/ui/PageStylesheet
 
+\define colour(name)
+<$transclude tiddler={{$:/palette}} index="$name$"/>
+\end
+\define border-radius(radius)
+```
+  -webkit-border-radius: $radius$;
+     -moz-border-radius: $radius$;
+          border-radius: $radius$;
+```
+\end
+\define box-shadow(shadow)
+```
+  -webkit-box-shadow: $shadow$;
+     -moz-box-shadow: $shadow$;
+          box-shadow: $shadow$;
+```
+\end
+\define filter(filter)
+```
+  -webkit-filter: $filter$;
+     -moz-filter: $filter$;
+          filter: $filter$;
+```
+\end
+\define transition(transition)
+```
+  -webkit-transition: $transition$;
+     -moz-transition: $transition$;
+          transition: $transition$;
+```
+\end
+\define transform-origin(origin)
+```
+  -webkit-transform-origin: $origin$;
+     -moz-transform-origin: $origin$;
+          transform-origin: $origin$;
+```
+\end
+\define background-linear-gradient(gradient)
+```
+background-image: linear-gradient($gradient$);
+background-image: -o-linear-gradient($gradient$);
+background-image: -moz-linear-gradient($gradient$);
+background-image: -webkit-linear-gradient($gradient$);
+background-image: -ms-linear-gradient($gradient$);
+```
+\end
 <$list filter="[is[shadow]tag[$:/tags/stylesheet]] [!is[shadow]tag[$:/tags/stylesheet]]">
 <$transclude/>
 </$list>
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 682b72c0a..7298cd94d 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -2,53 +2,9 @@ title: $:/themes/tiddlywiki/snowwhite/base
 tags: [[$:/tags/stylesheet]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
-\define border-radius(radius)
-```
-  -webkit-border-radius: $radius$;
-     -moz-border-radius: $radius$;
-          border-radius: $radius$;
-```
-\end
-\define box-shadow(shadow)
-```
-  -webkit-box-shadow: $shadow$;
-     -moz-box-shadow: $shadow$;
-          box-shadow: $shadow$;
-```
-\end
-\define filter(filter)
-```
-  -webkit-filter: $filter$;
-     -moz-filter: $filter$;
-          filter: $filter$;
-```
-\end
-\define transition(transition)
-```
-  -webkit-transition: $transition$;
-     -moz-transition: $transition$;
-          transition: $transition$;
-```
-\end
-\define transform-origin(origin)
-```
-  -webkit-transform-origin: $origin$;
-     -moz-transform-origin: $origin$;
-          transform-origin: $origin$;
-```
-\end
-\define background-linear-gradient(gradient)
-```
-background-image: linear-gradient($gradient$);
-background-image: -o-linear-gradient($gradient$);
-background-image: -moz-linear-gradient($gradient$);
-background-image: -webkit-linear-gradient($gradient$);
-background-image: -ms-linear-gradient($gradient$);
-```
-\end
 
 .sidebar-header {
-	text-shadow: 0 1px 0 rgba(255,255,255, 0.8);
+	text-shadow: 0 1px 0 <<colour sidebar-foreground-shadow>>;
 }
 
 .tw-page-controls svg {
diff --git a/themes/tiddlywiki/starlight/themetweaks.tid b/themes/tiddlywiki/starlight/themetweaks.tid
index 9487b749c..854f3af30 100644
--- a/themes/tiddlywiki/starlight/themetweaks.tid
+++ b/themes/tiddlywiki/starlight/themetweaks.tid
@@ -1,5 +1,5 @@
 title: $:/themes/tiddlywiki/starlight/themetweaks
-tags: $:/tags/ControlPanel
+tags: $:/tags/ControlPanel/Appearance
 caption: Star Tweaks
 
 Demo of a control panel tab dynamically loaded with a theme.
diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
index 66878c823..ad700e7dd 100644
--- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid
+++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
@@ -6,24 +6,6 @@ You can tweak certain aspects of the ''Vanilla'' theme.
 
 //Take care to preserve any backticks (&#96;) in the settings//
 
-! Colours
-
-* Primary colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="primary" default="" tag="input" type="color"/>
-* Background colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="background" default="" tag="input" type="color"/>
-* Foreground colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="foreground" default="" tag="input" type="color"/>
-* Page background colour: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="pagebackground" default="" tag="input" type="color"/>
-* Medium contrast color: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colours" index="medium" default="" tag="input" type="color"/>
-
-! Colour mappings
-
-* Tiddler background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="tiddlerbackground" default="" tag="input"/>
-* Tiddler foreground colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="foreground" default="" tag="input"/>
-* Page background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="pagebackground" default="" tag="input"/>
-* Link background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="linkbackground" default="" tag="input"/>
-* Link foreground colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="linkforeground" default="" tag="input"/>
-* Dropdown background colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="dropdownbackground" default="" tag="input"/>
-* Dropdown border colour mapping: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/colourmappings" index="dropdownborder" default="" tag="input"/>
-
 ! Settings
 
 * Font family: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings" index="fontfamily" default="" tag="input"/>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 6e7c50153..5bf57ba06 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -2,17 +2,6 @@ title: $:/themes/tiddlywiki/vanilla/base
 tags: [[$:/tags/stylesheet]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
-\define colour(name)
-<$transclude tiddler={{$:/palette}} index="$name$"/>
-\end
-\define border-radius(radius)
-```
-  -webkit-border-radius: $radius$;
-     -moz-border-radius: $radius$;
-          border-radius: $radius$;
-```
-\end
-
 /*
 ** Start with the normalize CSS reset, and then belay some of its effects
 */
diff --git a/themes/tiddlywiki/vanilla/colourmappings.tid b/themes/tiddlywiki/vanilla/colourmappings.tid
deleted file mode 100644
index e5a305d49..000000000
--- a/themes/tiddlywiki/vanilla/colourmappings.tid
+++ /dev/null
@@ -1,10 +0,0 @@
-title: $:/themes/tiddlywiki/vanilla/colourmappings
-type: application/x-tiddler-dictionary
-
-tiddlerbackground: {{$:/themes/tiddlywiki/vanilla/colours##background}}
-foreground: {{$:/themes/tiddlywiki/vanilla/colours##foreground}}
-pagebackground: {{$:/themes/tiddlywiki/vanilla/colours##pagebackground}}
-linkbackground: {{$:/themes/tiddlywiki/vanilla/colours##background}}
-linkforeground: {{$:/themes/tiddlywiki/vanilla/colours##primary}}
-dropdownbackground: {{$:/themes/tiddlywiki/vanilla/colours##background}}
-dropdownborder: {{$:/themes/tiddlywiki/vanilla/colours##medium}}
diff --git a/themes/tiddlywiki/vanilla/colours.tid b/themes/tiddlywiki/vanilla/colours.tid
deleted file mode 100644
index 851e69663..000000000
--- a/themes/tiddlywiki/vanilla/colours.tid
+++ /dev/null
@@ -1,8 +0,0 @@
-title: $:/themes/tiddlywiki/vanilla/colours
-type: application/x-tiddler-dictionary
-
-primary: #5778D8
-background: #ffffff
-foreground: #333333
-pagebackground: #ececec
-medium: #bbbbbb