diff --git a/game/scripts/wardrobe/color_picker.rpy b/game/scripts/wardrobe/color_picker.rpy
index 7ae6f9dd..5484c947 100644
--- a/game/scripts/wardrobe/color_picker.rpy
+++ b/game/scripts/wardrobe/color_picker.rpy
@@ -409,15 +409,6 @@ screen colorpickerscreen(item=None):
         default is_allowed = item.type.startswith(("makeup", "tattoo"))
     default transparency = item and not is_blacklisted and (is_allowed or is_cheating)
 
-    if config.developer:
-        vbox:
-            ypos 100
-            spacing 0
-            text "Hue:[cp.hue]"
-            text "Sat:[cp.saturation]"
-            text "Val:[cp.value]"
-            text "Alpha:[cp.alpha]"
-
     frame:
         style_prefix "colorpicker"
         background "cp_frame"
@@ -433,6 +424,8 @@ screen colorpickerscreen(item=None):
         if item:
             $ layers = [Color(tuple(i)) for i in item.color]
 
+            label "Layers" xalign 0.0
+
             hbox:
                 spacing 4
                 for i, col in enumerate(layers):
@@ -442,20 +435,31 @@ screen colorpickerscreen(item=None):
                         foreground "cp_borders"
                         action Return(["layer", i])
                         alternate Return(["replace", col])
+                        text str(i+1) style "colorpicker_innertext"
 
         hbox:
             vbox:
+                label "Colour Picker"
+
                 frame:
                     add cp.cpsv xysize (255, 255)
 
                 if transparency:
+                    label "Transparency"
+
                     frame:
                         add cp.cpa xysize (255, 30)
 
-            frame:
-                add cp.cph xysize (30, 255)
+            vbox:
+                label "Hue"
+
+                frame:
+                    add cp.cph xysize (30, 255)
 
             vbox:
+
+                label "Previews"
+
                 hbox:
                     spacing 4
                     frame:
@@ -465,11 +469,15 @@ screen colorpickerscreen(item=None):
                             xysize (28, 64)
                             background cp.start_color
                             action Return(["replace", cp.start_color])
+                            text "Old" style "colorpicker_innertext" size 8
                     frame:
                         button:
                             xysize (28, 64)
                             background cp.default_color
                             action Return(["replace", cp.default_color])
+                            text "Org" style "colorpicker_innertext" size 8
+
+                label "Swatches"
 
                 grid 5 7:
                     xalign 0.5
@@ -486,6 +494,35 @@ screen colorpickerscreen(item=None):
         textbutton "Finish":
             align (1.0, 1.0)
             action Return(["finish", cp.live_color])
+            keysym ["K_ESCAPE", "K_RETURN"]
+
+    if config.developer:
+        vbox:
+            pos (15, 15)
+            spacing 0
+            style_prefix "colorpickerdev"
+
+            text "Hue:[cp.hue]"
+            text "Sat:[cp.saturation]"
+            text "Val:[cp.value]"
+            text "Alpha:[cp.alpha]"
+
+style colorpickerdev_text:
+    size 12
+    color "#fff"
+    outlines [(1, "#00000080", 1, 0)]
+
+style colorpicker_innertext is colorpickerdev_text:
+    color "#ffffff00"
+    outlines []
+    hover_color "#ffffff"
+    hover_outlines [(1, "#00000080", 1, 0)]
+
+style colorpicker_label:
+    align (0.5, 0.5)
+
+style colorpicker_label_text:
+    color "#402313"
 
 style colorpicker_button_text:
     outlines []
@@ -495,7 +532,7 @@ style colorpicker_frame:
     padding (3, 3)
 
 style colorpicker_vbox:
-    spacing 22
+    spacing 6
 
 style colorpicker_hbox:
     spacing 22