diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 239873d924..8c9c65ce1a 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -52,9 +52,9 @@
     <Option name="measure line beat" value="b5b5b576"/>
     <Option name="meter bar" value="626470ff"/>
     <Option name="meter fill min" value="0000ffff"/>
+    <Option name="meter fill clip" value="ff0000ff"/>
     <Option name="meter fill mid" value="73f9baff"/>
     <Option name="meter fill max" value="00fd5dff"/>
-    <Option name="meter fill clip" value="ff0000ff"/>
     <Option name="midi meter fill min" value="effaa100"/>
     <Option name="midi meter fill clip" value="f83913ff"/>
     <Option name="midi meter fill mid" value="8fc78e00"/>
@@ -432,7 +432,7 @@
     <Option name="feedback alert: text active" value="e5e5e5ff"/>
     <Option name="feedback alert: text mid" value="00000000"/>
     <Option name="mute button: border start" value="ffcb8bff"/>
-    <Option name="mute button: border end" value="603600ff"/>
+    <Option name="mute button: border end" value="0c0802ff"/>
     <Option name="mute button: border start selected" value="00000000"/>
     <Option name="mute button: border end selected" value="00000000"/>
     <Option name="mute button: fill start" value="ac8568ff"/>
@@ -448,11 +448,11 @@
     <Option name="mute button: text active" value="191919ff"/>
     <Option name="mute button: text mid" value="262626ff"/>
     <Option name="solo button: border start" value="ffffffff"/>
-    <Option name="solo button: border end" value="757500ff"/>
+    <Option name="solo button: border end" value="0c0c02ff"/>
     <Option name="solo button: border start selected" value="000000ff"/>
     <Option name="solo button: border end selected" value="000000ff"/>
-    <Option name="solo button: fill start" value="b7ac6cff"/>
-    <Option name="solo button: fill end" value="575f53ff"/>
+    <Option name="solo button: fill start" value="a09865ff"/>
+    <Option name="solo button: fill end" value="585f4aff"/>
     <Option name="solo button: fill start active" value="fffd9bff"/>
     <Option name="solo button: fill end active" value="ffff00ff"/>
     <Option name="solo button: fill start mid" value="d7d697ff"/>
@@ -495,12 +495,12 @@
     <Option name="send alert button: text" value="ccccccff"/>
     <Option name="send alert button: text active" value="000000ff"/>
     <Option name="send alert button: text mid" value="00000000"/>
-    <Option name="transport button: border start" value="727272ff"/>
-    <Option name="transport button: border end" value="333333ff"/>
+    <Option name="transport button: border start" value="9e9e9eff"/>
+    <Option name="transport button: border end" value="070707ff"/>
     <Option name="transport button: border start selected" value="00000000"/>
     <Option name="transport button: border end selected" value="00000000"/>
-    <Option name="transport button: fill start" value="595959ff"/>
-    <Option name="transport button: fill end" value="0c0c0cff"/>
+    <Option name="transport button: fill start" value="656867ff"/>
+    <Option name="transport button: fill end" value="333333ff"/>
     <Option name="transport button: fill start active" value="a1ff43ff"/>
     <Option name="transport button: fill end active" value="00a300ff"/>
     <Option name="transport button: fill start mid" value="000000ff"/>
@@ -527,32 +527,32 @@
     <Option name="transport recenable button: text" value="00000000"/>
     <Option name="transport recenable button: text active" value="00000000"/>
     <Option name="transport recenable button: text mid" value="00000000"/>
-    <Option name="transport option button: border start" value="b7b7d2ff"/>
-    <Option name="transport option button: border end" value="000000ff"/>
-    <Option name="transport option button: border start selected" value="9a908eff"/>
-    <Option name="transport option button: border end selected" value="675c5bff"/>
-    <Option name="transport option button: fill start" value="5d5856ff"/>
-    <Option name="transport option button: fill end" value="564d48ff"/>
-    <Option name="transport option button: fill start active" value="5d5856ff"/>
-    <Option name="transport option button: fill end active" value="564d48ff"/>
+    <Option name="transport option button: border start" value="9597a5ff"/>
+    <Option name="transport option button: border end" value="0f0f0fff"/>
+    <Option name="transport option button: border start selected" value="000000ff"/>
+    <Option name="transport option button: border end selected" value="282828ff"/>
+    <Option name="transport option button: fill start" value="636470ff"/>
+    <Option name="transport option button: fill end" value="4a4b51ff"/>
+    <Option name="transport option button: fill start active" value="636470ff"/>
+    <Option name="transport option button: fill end active" value="4a4b51ff"/>
     <Option name="transport option button: fill start mid" value="5d5856ff"/>
-    <Option name="transport option button: fill end mid" value="564d48ff"/>
+    <Option name="transport option button: fill end mid" value="56575eff"/>
     <Option name="transport option button: led" value="4f3300ff"/>
     <Option name="transport option button: led active" value="ffa500ff"/>
     <Option name="transport option button: led mid" value="b87700ff"/>
     <Option name="transport option button: text" value="c7c7d8ff"/>
     <Option name="transport option button: text active" value="c8c8d9ff"/>
     <Option name="transport option button: text mid" value="000000ff"/>
-    <Option name="transport active option button: border start" value="b7b7d2ff"/>
-    <Option name="transport active option button: border end" value="000000ff"/>
-    <Option name="transport active option button: border start selected" value="9a908eff"/>
-    <Option name="transport active option button: border end selected" value="675c5bff"/>
-    <Option name="transport active option button: fill start" value="5d5856ff"/>
-    <Option name="transport active option button: fill end" value="564d48ff"/>
+    <Option name="transport active option button: border start" value="a9b2a9ff"/>
+    <Option name="transport active option button: border end" value="0c0c0cff"/>
+    <Option name="transport active option button: border start selected" value="8a998aff"/>
+    <Option name="transport active option button: border end selected" value="596359ff"/>
+    <Option name="transport active option button: fill start" value="606b60ff"/>
+    <Option name="transport active option button: fill end" value="555d54ff"/>
     <Option name="transport active option button: fill start active" value="a1ff43ff"/>
     <Option name="transport active option button: fill end active" value="00a300ff"/>
-    <Option name="transport active option button: fill start mid" value="5d5856ff"/>
-    <Option name="transport active option button: fill end mid" value="564d48ff"/>
+    <Option name="transport active option button: fill start mid" value="565d56ff"/>
+    <Option name="transport active option button: fill end mid" value="5a6359ff"/>
     <Option name="transport active option button: led" value="4f3300ff"/>
     <Option name="transport active option button: led active" value="ffa500ff"/>
     <Option name="transport active option button: led mid" value="b87700ff"/>
@@ -607,16 +607,16 @@
     <Option name="mouse mode button: text" value="c7c7d8ff"/>
     <Option name="mouse mode button: text active" value="000000ff"/>
     <Option name="mouse mode button: text mid" value="000000ff"/>
-    <Option name="zoom button: border start" value="b7b7d2ff"/>
-    <Option name="zoom button: border end" value="000000ff"/>
+    <Option name="zoom button: border start" value="9092a3ff"/>
+    <Option name="zoom button: border end" value="0a0a0aff"/>
     <Option name="zoom button: border start selected" value="9a908eff"/>
     <Option name="zoom button: border end selected" value="675c5bff"/>
-    <Option name="zoom button: fill start" value="5d5856ff"/>
-    <Option name="zoom button: fill end" value="564d48ff"/>
+    <Option name="zoom button: fill start" value="626370ff"/>
+    <Option name="zoom button: fill end" value="4a4b51ff"/>
     <Option name="zoom button: fill start active" value="4d4d4dff"/>
     <Option name="zoom button: fill end active" value="121212ff"/>
     <Option name="zoom button: fill start mid" value="5d5856ff"/>
-    <Option name="zoom button: fill end mid" value="564d48ff"/>
+    <Option name="zoom button: fill end mid" value="53545eff"/>
     <Option name="zoom button: led" value="4f3300ff"/>
     <Option name="zoom button: led active" value="ffa500ff"/>
     <Option name="zoom button: led mid" value="b87700ff"/>
@@ -625,28 +625,36 @@
     <Option name="zoom button: text mid" value="000000ff"/>
     <Option name="route button: border start" value="b7b7d2ff"/>
     <Option name="route button: border end" value="000000ff"/>
-    <Option name="route button: border start selected" value="9a908eff"/>
-    <Option name="route button: border end selected" value="675c5bff"/>
-    <Option name="route button: fill start" value="5d5856ff"/>
-    <Option name="route button: fill end" value="564d48ff"/>
+    <Option name="route button: border start selected" value="8e8e9aff"/>
+    <Option name="route button: border end selected" value="5b5b67ff"/>
+    <Option name="route button: fill start" value="56565dff"/>
+    <Option name="route button: fill end" value="484856ff"/>
     <Option name="route button: fill start active" value="4d4d4dff"/>
     <Option name="route button: fill end active" value="121212ff"/>
-    <Option name="route button: fill start mid" value="5d5856ff"/>
-    <Option name="route button: fill end mid" value="564d48ff"/>
+    <Option name="route button: fill start mid" value="57565dff"/>
+    <Option name="route button: fill end mid" value="484856ff"/>
     <Option name="route button: led" value="4f3300ff"/>
     <Option name="route button: led active" value="ffa500ff"/>
     <Option name="route button: led mid" value="b87700ff"/>
     <Option name="route button: text" value="c7c7d8ff"/>
     <Option name="route button: text active" value="c8c8d9ff"/>
     <Option name="route button: text mid" value="000000ff"/>
-    <Option name="transport clock: text" value="6bb620ff"/>
     <Option name="transport clock: background" value="000000ff"/>
+    <Option name="transport clock: text" value="6bb620ff"/>
     <Option name="transport clock: edited text" value="ffa500ff"/>
     <Option name="transport clock: cursor" value="ffa500ff"/>
-    <Option name="secondary clock: text" value="6bb620ff"/>
     <Option name="secondary clock: background" value="000000ff"/>
+    <Option name="secondary clock: text" value="6bb620ff"/>
     <Option name="secondary clock: edited text" value="ffa500ff"/>
     <Option name="secondary clock: cursor" value="ffa500ff"/>
+    <Option name="transport delta clock: background" value="000000ff"/>
+    <Option name="transport delta clock: text" value="0009f3ff"/>
+    <Option name="transport delta clock: edited text" value="ff0000ff"/>
+    <Option name="transport delta clock: cursor" value="f11000ff"/>
+    <Option name="secondary delta clock: background" value="000000ff"/>
+    <Option name="secondary delta clock: text" value="0009f3ff"/>
+    <Option name="secondary delta clock: edited text" value="ff0000ff"/>
+    <Option name="secondary delta clock: cursor" value="f11000ff"/>
     <Option name="big clock: background" value="020202ff"/>
     <Option name="big clock: text" value="f0f0f0ff"/>
     <Option name="big clock: edited text" value="ffa500ff"/>
@@ -655,28 +663,20 @@
     <Option name="big clock active: text" value="f11000ff"/>
     <Option name="big clock active: edited text" value="ffa500ff"/>
     <Option name="big clock active: cursor" value="ffa500ff"/>
-    <Option name="transport delta clock: text" value="0009f3ff"/>
-    <Option name="transport delta clock: background" value="000000ff"/>
-    <Option name="transport delta clock: edited text" value="ff0000ff"/>
-    <Option name="transport delta clock: cursor" value="f11000ff"/>
-    <Option name="secondary delta clock: text" value="0009f3ff"/>
-    <Option name="secondary delta clock: background" value="000000ff"/>
-    <Option name="secondary delta clock: edited text" value="ff0000ff"/>
-    <Option name="secondary delta clock: cursor" value="f11000ff"/>
-    <Option name="punch clock: text" value="6bb620ff"/>
     <Option name="punch clock: background" value="000000ff"/>
+    <Option name="punch clock: text" value="6bb620ff"/>
     <Option name="punch clock: edited text" value="ff0000ff"/>
     <Option name="punch clock: cursor" value="f11000ff"/>
-    <Option name="nudge clock: text" value="6bb620ff"/>
-    <Option name="nudge clock: background" value="000000ff"/>
-    <Option name="nudge clock: edited text" value="ffa500ff"/>
-    <Option name="nudge clock: cursor" value="ffa500ff"/>
-    <Option name="selection clock: text" value="6bb620ff"/>
     <Option name="selection clock: background" value="000000ff"/>
+    <Option name="selection clock: text" value="6bb620ff"/>
     <Option name="selection clock: edited text" value="ff0000ff"/>
     <Option name="selection clock: cursor" value="f11000ff"/>
-    <Option name="clock: text" value="6bb620ff"/>
+    <Option name="nudge clock: background" value="000000ff"/>
+    <Option name="nudge clock: text" value="6bb620ff"/>
+    <Option name="nudge clock: edited text" value="ffa500ff"/>
+    <Option name="nudge clock: cursor" value="ffa500ff"/>
     <Option name="clock: background" value="000000ff"/>
+    <Option name="clock: text" value="6bb620ff"/>
     <Option name="clock: edited text" value="ffa500ff"/>
     <Option name="clock: cursor" value="ffa500ff"/>
   </Canvas>