From 01b26c3bb8bcaea5906ae97ddfe4c5c13040e9f0 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 2 Feb 2025 11:08:11 -0700
Subject: [PATCH] define better insensitive colors for CC lines in pianoroll
 (all themes)

---
 gtk2_ardour/themes/adwaita_dark-ardour.colors   | 16 ++++++++--------
 gtk2_ardour/themes/blueberry_milk-ardour.colors | 16 ++++++++--------
 gtk2_ardour/themes/caineville-ardour.colors     | 16 ++++++++--------
 gtk2_ardour/themes/captain_light-ardour.colors  | 16 ++++++++--------
 gtk2_ardour/themes/clear_gray-ardour.colors     | 16 ++++++++--------
 gtk2_ardour/themes/cubasish-ardour.colors       | 16 ++++++++--------
 gtk2_ardour/themes/dark-ardour.colors           | 16 ++++++++--------
 gtk2_ardour/themes/diehard3-ardour.colors       | 16 ++++++++--------
 gtk2_ardour/themes/recbox-ardour.colors         | 16 ++++++++--------
 gtk2_ardour/themes/unastudia-ardour.colors      | 16 ++++++++--------
 gtk2_ardour/themes/xcolors-ardour.colors        | 16 ++++++++--------
 11 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/gtk2_ardour/themes/adwaita_dark-ardour.colors b/gtk2_ardour/themes/adwaita_dark-ardour.colors
index e577b164b8..3cf0a5143c 100644
--- a/gtk2_ardour/themes/adwaita_dark-ardour.colors
+++ b/gtk2_ardour/themes/adwaita_dark-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="widget:green lighter" value="57e389ff"/>
     <Color name="widget:orange" value="fd7e14ff"/>
     <Color name="widget:ruddy" value="087f5bff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
     <Color name="widget:yellow" value="f5c211ff"/>
   </Colors>
   <ColorAliases>
@@ -62,14 +70,6 @@
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation line" alias="alert:green"/>
     <ColorAlias name="automation track outline" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index cccbe15fe3..cd2419483a 100644
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 55" value="008dffff"/>
     <Color name="midi meter 56" value="0fff00ff"/>
   </Colors>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
     <ColorAlias name="arrange base" alias="theme:bg"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="big clock active:gtk_somewhat_bright_indicator background" alias="neutral:backgroundest"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: text" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 80a87286c1..b867e525da 100644
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 54" value="d40310ff"/>
     <Color name="midi meter 55" value="9d000aff"/>
     <Color name="midi meter 56" value="4b2414ff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation line" alias="theme:contrasting"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/captain_light-ardour.colors b/gtk2_ardour/themes/captain_light-ardour.colors
index 8e00112fb4..a22c30087c 100644
--- a/gtk2_ardour/themes/captain_light-ardour.colors
+++ b/gtk2_ardour/themes/captain_light-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="widget:green darker" value="264542ff"/>
     <Color name="widget:orange" value="904010ff"/>
     <Color name="widget:ruddy" value="3650bfff"/>    
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation line" alias="neutral:backgroundest"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index 8f2b5a613a..13d1f244f0 100644
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 54" value="454545ff"/>
     <Color name="midi meter 55" value="363636ff"/>
     <Color name="midi meter 56" value="262626ff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation line" alias="neutral:backgroundest"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index e18037db4c..6ecac34e65 100644
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 54" value="7610baff"/>
     <Color name="midi meter 55" value="b22353ff"/>
     <Color name="midi meter 56" value="ea0508ff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation line" alias="alert:greenish"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 1644040d40..e195d599da 100644
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 52" value="e8faa1ff"/>
     <Color name="midi meter 53" value="f2c37dff"/>
     <Color name="midi meter 54" value="ffac44ff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
     <Color name="midi meter 55" value="f48352ff"/>
     <Color name="midi meter 56" value="f85813ff"/>
   </Colors>
@@ -61,14 +69,6 @@
     <ColorAlias name="audio master bus base" alias="neutral:backgroundest"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="audio track base" alias="neutral:background"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="automation line" alias="alert:green"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
diff --git a/gtk2_ardour/themes/diehard3-ardour.colors b/gtk2_ardour/themes/diehard3-ardour.colors
index 75f1bf27f8..d46c50168e 100644
--- a/gtk2_ardour/themes/diehard3-ardour.colors
+++ b/gtk2_ardour/themes/diehard3-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="widget:green darker" value="666666ff"/>
     <Color name="widget:orange" value="9f440dff"/>
     <Color name="widget:ruddy" value="7a340adc"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
     <Color name="widget:yellow" value="eddc3dff"/> <!-- VU meter outline -->
   </Colors>
   <ColorAliases>
@@ -61,14 +69,6 @@
     <ColorAlias name="audio track base" alias="neutral:background"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation line" alias="alert:green"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/recbox-ardour.colors b/gtk2_ardour/themes/recbox-ardour.colors
index 117883f701..80cc5cb5d8 100644
--- a/gtk2_ardour/themes/recbox-ardour.colors
+++ b/gtk2_ardour/themes/recbox-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="widget:green darker" value="1d5a4eff"/>
     <Color name="widget:orange" value="e88637ff"/>
     <Color name="widget:ruddy" value="b6061dff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
     <Color name="widget:yellow" value="eddc3dff"/> <!-- VU meter outline -->
   </Colors>
   <ColorAliases>
@@ -61,14 +69,6 @@
     <ColorAlias name="audio track base" alias="neutral:background"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation line" alias="alert:green"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 0cc9f7b131..29b093c5d3 100644
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 55" value="70c4daff"/>
     <Color name="midi meter 56" value="8ee7ffff"/>
   </Colors>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
     <ColorAlias name="arrange base" alias="neutral:background2"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation track outline" alias="theme:bg1"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: text" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/xcolors-ardour.colors b/gtk2_ardour/themes/xcolors-ardour.colors
index 366e00f4a7..0bd94b60f5 100644
--- a/gtk2_ardour/themes/xcolors-ardour.colors
+++ b/gtk2_ardour/themes/xcolors-ardour.colors
@@ -47,6 +47,14 @@
     <Color name="midi meter 54" value="fd7e14ff"/>
     <Color name="midi meter 55" value="fd7e14ff"/>
     <Color name="midi meter 56" value="fa5252ff"/>
+    <Color name="pianoroll: velocity" value="ff9408ff"/>
+    <Color name="pianoroll: insensitive bender line" value="96b2df84"/>
+    <Color name="pianoroll: insensitive pressure line" value="96dfc984"/>
+    <Color name="pianoroll: insensitive modulation line" value="afdf9684"/>
+    <Color name="pianoroll: insensitive expression line" value="dfc59684"/>
+    <Color name="pianoroll: user1 line" value="df96b084"/>
+    <Color name="pianoroll: user2 line" value="bc96df84"/>
+    <Color name="pianoroll: user3 line" value="9699df84"/>
   </Colors>
   <ColorAliases>
     <ColorAlias name="active crossfade" alias="neutral:foreground"/>
@@ -61,14 +69,6 @@
     <ColorAlias name="automation line" alias="alert:greenish"/>
     <ColorAlias name="automation line insensitive" alias="neutral:foreground2"/>
     <ColorAlias name="automation track outline" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: velocity" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive bender line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive pressure line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive modulation line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: insensitive expression line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user1 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user2 line" alias="theme:bg2"/>
-    <ColorAlias name="pianoroll: user3 line" alias="theme:bg2"/>
     <ColorAlias name="big clock active: background" alias="neutral:backgroundest"/>
     <ColorAlias name="big clock active: cursor" alias="theme:contrasting alt"/>
     <ColorAlias name="big clock active: edited text" alias="theme:contrasting alt"/>