X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour3_ui_dark.rc.in;h=3af061c9ce2285c2dd5c07d984aa35504165889c;hb=d08e3b94c5ef75ce5d4d28f3636faa8af4661e17;hp=cd823fa7cad5e67d4ac4390f28b83db023cb8898;hpb=22cd1335058774c06d685dd4ff9bb5d5164ea561;p=ardour.git

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index cd823fa7ca..3af061c9ce 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -84,19 +84,19 @@ style "medium_bold_text"
 
 style "medium_text"
 {
- 	font_name = "@FONT_NORMAL"
+ 	font_name = "@FONT_NORMAL@"
 }
 
 style "medium_monospace_text"
 {
- 	#font_name = "monospace @FONT_NORMAL@"
+        font_name = "monospace @FONT_NORMAL@"
 }
 
 style "red_medium_text" = "medium_text"
 {	
-	fg[NORMAL] = @A_bright_indicator
-	fg[ACTIVE] = @A_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
+	fg[NORMAL] = @@COLPREFIX@_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
 style "large_bold_text"
@@ -121,12 +121,12 @@ style "big_bold_text"
 
 style "plugin_name_text" = "big_bold_text"
 {
-	fg[NORMAL] = @A_text
+	fg[NORMAL] = @@COLPREFIX@_text
 }
 
 style "plugin_maker_text" = "larger_bold_text"
 {
-	fg[NORMAL] = @A_text
+	fg[NORMAL] = @@COLPREFIX@_text
 }
 
 style "verbose_canvas_cursor" = "big_bold_text"
@@ -149,14 +149,14 @@ style "time_axis_view_item_name" = "very small text"
 style "default" = "medium_text"
 {
   #Original values for reference
-  GtkWidget::cursor_color =  @A_lightest
+  GtkWidget::cursor_color =  @@COLPREFIX@_lightest
   GtkButton::default_border = { 0, 0, 0, 0 }
   GtkButton::default_outside_border = { 0, 0, 0, 0 }
   GtkButton::button_relief = GTK_RELIEF_NONE
   GtkTreeView::vertical-padding = 0
   GtkTreeView::horizontal-padding = 0
-  GtkTreeView::even-row-color = @A_base
-  GtkTreeView::odd-row-color = darker(@A_base)
+  GtkTreeView::even-row-color = @@COLPREFIX@_base
+  GtkTreeView::odd-row-color = darker(@@COLPREFIX@_base)
   
   GtkWidget           :: focus-line-pattern               = "\001\001"        #                              Dash pattern used to draw the focus indicator.
   GtkWidget           :: focus-line-width                 = 1                 # [               1 ] ( >= 0 ) Width, in pixels, of the focus indicator line.
@@ -165,8 +165,8 @@ style "default" = "medium_text"
   GtkWidget           :: scroll-arrow-hlength             = 16                # [              16 ] ( >= 1 ) Length of horizontal scroll arrows.
   GtkWidget           :: scroll-arrow-vlength             = 16                # [              16 ] ( >= 1 ) Length of vertical scroll arrows.
 
-  GtkWidget           :: link-color                       = shade(1.25, @A_bright_color)
-  GtkWidget           :: visited-link-color               = @A_bright_color
+  GtkWidget           :: link-color                       = shade(1.25, @@COLPREFIX@_bright_color)
+  GtkWidget           :: visited-link-color               = @@COLPREFIX@_bright_color
   
 #Window Properties
   GtkDialog           :: action-area-border               = 4                 # [               5 ] ( >= 0 ) Width of border around the button area at the bottom of the dialog.
@@ -257,29 +257,29 @@ style "default" = "medium_text"
   #ythickness = 0
 
 #Base Colors
-  bg[NORMAL]          = @A_bg
-  bg[PRELIGHT]        = shade(1.1, @A_bg)
-  bg[ACTIVE]          = shade(0.9, @A_bg)
-  bg[INSENSITIVE]     = @A_bg
-  bg[SELECTED]        = @A_bg_selected
-
-  fg[NORMAL]          = @A_fg
-  fg[PRELIGHT]        = @A_fg
-  fg[ACTIVE]          = shade(0.9, @A_fg)
-  fg[INSENSITIVE]     = shade(0.7, @A_bg)
-  fg[SELECTED]        = @A_fg_selected
-
-  base[NORMAL]        = @A_base
-  base[PRELIGHT]      = @A_base
-  base[INSENSITIVE]   = shade(1.0, @A_bg)
-  base[ACTIVE]        = shade(0.9, @A_bg_selected)
-  base[SELECTED]      = @A_bg_selected
-
-  text[NORMAL]        = @A_text
-  text[PRELIGHT]      = @A_text
-  text[ACTIVE]        = @A_fg_selected
-  text[INSENSITIVE]   = shade(0.7, @A_bg)
-  text[SELECTED]      = @A_fg_selected
+  bg[NORMAL]          = @@COLPREFIX@_bg
+  bg[PRELIGHT]        = shade(1.1, @@COLPREFIX@_bg)
+  bg[ACTIVE]          = shade(0.9, @@COLPREFIX@_bg)
+  bg[INSENSITIVE]     = @@COLPREFIX@_bg
+  bg[SELECTED]        = @@COLPREFIX@_bg_selected
+
+  fg[NORMAL]          = @@COLPREFIX@_fg
+  fg[PRELIGHT]        = @@COLPREFIX@_fg
+  fg[ACTIVE]          = shade(0.9, @@COLPREFIX@_fg)
+  fg[INSENSITIVE]     = shade(0.7, @@COLPREFIX@_bg)
+  fg[SELECTED]        = @@COLPREFIX@_fg_selected
+
+  base[NORMAL]        = @@COLPREFIX@_base
+  base[PRELIGHT]      = @@COLPREFIX@_base
+  base[INSENSITIVE]   = shade(1.0, @@COLPREFIX@_bg)
+  base[ACTIVE]        = shade(0.9, @@COLPREFIX@_bg_selected)
+  base[SELECTED]      = @@COLPREFIX@_bg_selected
+
+  text[NORMAL]        = @@COLPREFIX@_text
+  text[PRELIGHT]      = @@COLPREFIX@_text
+  text[ACTIVE]        = @@COLPREFIX@_fg_selected
+  text[INSENSITIVE]   = shade(0.7, @@COLPREFIX@_bg)
+  text[SELECTED]      = @@COLPREFIX@_fg_selected
 
 #engine specific tweaks
 
@@ -292,10 +292,20 @@ style "default" = "medium_text"
   }
 }
 
+style "contrasting_popup" = "medium_monospace_text"
+{
+  bg[NORMAL]          = @@COLPREFIX@_lightest
+  fg[NORMAL]          = @@COLPREFIX@_darkest
+  base[NORMAL]        = @@COLPREFIX@_lightest
+  text[NORMAL]        = @@COLPREFIX@_darkest
+  text[ACTIVE]        = @@COLPREFIX@_darkest
+  text[SELECTED]      = @@COLPREFIX@_darkest
+}
+
 style "base_frame"
 {
-	fg[NORMAL] = @A_bg
-	bg[NORMAL] = @A_bg
+	fg[NORMAL] = @@COLPREFIX@_bg
+	bg[NORMAL] = @@COLPREFIX@_bg
 }
 
 style "transport_base" = "medium_bold_text"
@@ -307,9 +317,15 @@ style "default_button" = "small_text"
 {
 }
 
+style "mouse_mode_button" = "default_button"
+{
+        bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+        fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
 style "default_menu" = "medium_text"
 {
-  #bg[NORMAL] = darker(@A_bg)
+  #bg[NORMAL] = darker(@@COLPREFIX@_bg)
 }
 
 style "default_generic" = "medium_text"
@@ -318,7 +334,7 @@ style "default_generic" = "medium_text"
 
 style "text_cell_entry" = "medium_text"
 {
-	GtkWidget::cursor_color =  @A_darkest
+	GtkWidget::cursor_color =  @@COLPREFIX@_darkest
 }
 
 style "very_small_button" = "default_button" 
@@ -333,72 +349,70 @@ style "small_button" = "default_button"
 
 style "very_small_red_active_and_selected_button" = "very_small_button"
 {
-	fg[ACTIVE] = @A_darkest
-	bg[ACTIVE] = @A_bright_indicator
-	bg[SELECTED] = @A_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	bg[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
 style "small_red_active_and_selected_button" = "small_button"
 {
-	fg[ACTIVE] = @A_darkest
-	bg[ACTIVE] = @A_bright_indicator
-	bg[SELECTED] = @A_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	bg[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
 style "gain_fader"
 {
-	bg[NORMAL] =   { 0.269, 0.269, 0.300}
-	bg[ACTIVE] =   { 0.152, 0.152, 0.168 }
+        bg[NORMAL] = shade (0.7, @@COLPREFIX@_lightest)
+	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_lightest)
 }
 
-
-
 #MSR and related buttons
 
 style "track_rec_enable_button" = "small_button"
 {
-	fg[ACTIVE] =   @A_darkest
-        bg[NORMAL] =   mix(0.08,@A_arm,@A_bg)
-        bg[PRELIGHT] = shade(1.1,mix(0.08,@A_arm,@A_bg))
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+        bg[NORMAL] =   mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
+        bg[PRELIGHT] = shade(1.1,mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
 }
 
 style "track_rec_enable_button_active" = "small_button"
 {
-	#fg[ACTIVE] =   @A_darkest
-	#fg[SELECTED] = @A_darkest
-	#fg[PRELIGHT] = @A_darkest
-	#fg[NORMAL] = @A_darkest
+	#fg[ACTIVE] =   @@COLPREFIX@_darkest
+	#fg[SELECTED] = @@COLPREFIX@_darkest
+	#fg[PRELIGHT] = @@COLPREFIX@_darkest
+	#fg[NORMAL] = @@COLPREFIX@_darkest
 
-	bg[NORMAL] =   @A_arm
-	bg[ACTIVE] =   @A_arm
-	bg[SELECTED] =   @A_arm
-	bg[PRELIGHT] =   shade(1.1, @A_arm)
+	bg[NORMAL] =   @@COLPREFIX@_arm
+	bg[ACTIVE] =   @@COLPREFIX@_arm
+	bg[SELECTED] =   @@COLPREFIX@_arm
+	bg[PRELIGHT] =   shade(1.1, @@COLPREFIX@_arm)
 }
 
 style "track_rec_enable_button_alternate" = "small_button"
 {
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] =   @A_darkest
-	fg[PRELIGHT] = @A_darkest
-	fg[NORMAL] = @A_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
 
-	bg[NORMAL] =   lighter(@A_arm)
-	bg[ACTIVE] =   lighter(@A_arm)
-	bg[SELECTED] =   lighter(@A_arm)
-	bg[PRELIGHT] =   shade(1.1, lighter(@A_arm))
+	bg[NORMAL] =   lighter(@@COLPREFIX@_arm)
+	bg[ACTIVE] =   lighter(@@COLPREFIX@_arm)
+	bg[SELECTED] =   lighter(@@COLPREFIX@_arm)
+	bg[PRELIGHT] =   shade(1.1, lighter(@@COLPREFIX@_arm))
 }
 
 style "track_rec_enable_button_alternate_two" = "small_button"
 {
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] =   @A_darkest
-	fg[PRELIGHT] = @A_darkest
-	fg[NORMAL] = @A_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
 
-	bg[NORMAL] =   darker(@A_arm)
-	bg[ACTIVE] =   darker(@A_arm)
-	bg[SELECTED] =   darker(@A_arm)
-	bg[PRELIGHT] =   shade(1.1, darker(@A_arm))
+	bg[NORMAL] =   darker(@@COLPREFIX@_arm)
+	bg[ACTIVE] =   darker(@@COLPREFIX@_arm)
+	bg[SELECTED] =   darker(@@COLPREFIX@_arm)
+	bg[PRELIGHT] =   shade(1.1, darker(@@COLPREFIX@_arm))
 }
 
 style "mixer_track_rec_enable_button" = "track_rec_enable_button"
@@ -422,21 +436,21 @@ style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
 
 style "solo_button" = "small_button"
 {
-  bg[NORMAL] = mix(0.1,@A_solo,@A_bg)
-  bg[ACTIVE] = @A_solo
-  fg[ACTIVE] = @A_darkest
+  bg[NORMAL] = mix(0.1,@@COLPREFIX@_solo,@@COLPREFIX@_bg)
+  bg[ACTIVE] = @@COLPREFIX@_solo
+  fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "solo_isolate_led"
 {
-  fg[NORMAL] = mix(0.2,@A_isolate, @A_darkest)
-  fg[ACTIVE] = @A_isolate
+  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
+  fg[ACTIVE] = @@COLPREFIX@_isolate
 }
 
 style "solo_safe_led"
 {
-  fg[NORMAL] = mix(0.2,@A_isolate, @A_darkest)
-  fg[ACTIVE] = @A_isolate
+  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
+  fg[ACTIVE] = @@COLPREFIX@_isolate
 }
 
 style "solo_button_alternate" = "small_button"
@@ -445,12 +459,12 @@ style "solo_button_alternate" = "small_button"
         # this is the "solo-isolated" solo theme
         #
 
-	bg[ACTIVE] = lighter(@A_solo)
+	bg[ACTIVE] = lighter(@@COLPREFIX@_solo)
 
-	fg[ACTIVE] = @A_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
-	fg[NORMAL] = @A_bright_indicator
-	fg[PRELIGHT] = shade(1.1, @A_bright_indicator)
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	fg[NORMAL] = @@COLPREFIX@_bright_indicator
+	fg[PRELIGHT] = shade(1.1, @@COLPREFIX@_bright_indicator)
 }
 
 style "solo_button_alternate2" = "small_button"
@@ -459,15 +473,15 @@ style "solo_button_alternate2" = "small_button"
         # this is the "half-bright" solo theme
         #
 
-	bg[NORMAL] = darker(@A_solo) 
-	bg[ACTIVE] = darker(@A_solo)
-	bg[SELECTED] = darker(@A_solo)
-	bg[PRELIGHT] = shade(1.1, darker(@A_solo))
+	bg[NORMAL] = darker(@@COLPREFIX@_solo) 
+	bg[ACTIVE] = darker(@@COLPREFIX@_solo)
+	bg[SELECTED] = darker(@@COLPREFIX@_solo)
+	bg[PRELIGHT] = shade(1.1, darker(@@COLPREFIX@_solo))
 
-	fg[ACTIVE] = @A_darkest
-	fg[SELECTED] = @A_darkest
-	fg[NORMAL] = @A_darkest
-	fg[PRELIGHT] = @A_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
 }
 
 style "solo_button_active" = "small_button"
@@ -476,21 +490,21 @@ style "solo_button_active" = "small_button"
         # this is the "full-bright" solo theme
         #
 
-	bg[NORMAL] = @A_solo
-	bg[ACTIVE] = @A_solo
-	bg[SELECTED] = @A_solo
-	bg[PRELIGHT] = shade(1.1, @A_solo)
+	bg[NORMAL] = @@COLPREFIX@_solo
+	bg[ACTIVE] = @@COLPREFIX@_solo
+	bg[SELECTED] = @@COLPREFIX@_solo
+	bg[PRELIGHT] = shade(1.1, @@COLPREFIX@_solo)
 
-	fg[ACTIVE] = @A_darkest
-	fg[SELECTED] = @A_darkest
-	fg[NORMAL] = @A_darkest
-	fg[PRELIGHT] = @A_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
 }
 
 style "mixer_invert_button" = "small_button"
 {
-	bg[ACTIVE] = @A_not_so_bright_indicator
-	fg[ACTIVE] = @A_darkest
+	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "mixer_solo_button" = "solo_button"
@@ -520,79 +534,79 @@ style "mixer_solo_button_active" = "solo_button_active"
 
 style "monitor_opt_button" = "small_button"
 {
-        bg[NORMAL] = mix(0.1,@A_not_so_bright_indicator,@A_bg)
-	bg[ACTIVE] = @A_not_so_bright_indicator
-	fg[ACTIVE] = @A_darkest
+        bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
+	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "monitor_mono_button" = "small_button"
 {
-	bg[NORMAL] = mix(0.1,@A_mono,@A_bg)
-        bg[ACTIVE] = @A_mono
-	fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mono,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_mono
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "monitor_invert_button" = "small_button"
 {
-	bg[NORMAL] = mix(0.1,@A_not_so_bright_indicator,@A_bg)
-        bg[ACTIVE] = @A_not_so_bright_indicator
-	fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "monitor_mute_button" = "small_button"
 {
-	bg[NORMAL] = mix(0.1,@A_mute,@A_bg)
-        bg[ACTIVE] = @A_mute
-	fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_mute
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "monitor_dim_button" = "small_button"
 {
-	bg[NORMAL] = mix(0.1,lighter(@A_mute),@A_bg)
-        bg[ACTIVE] = lighter(@A_mute)
-	fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = mix(0.1,lighter(@@COLPREFIX@_mute),@@COLPREFIX@_bg)
+        bg[ACTIVE] = lighter(@@COLPREFIX@_mute)
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "monitor_iso_button" = "small_button"
 {
-	bg[NORMAL] = mix(0.1,@A_somewhat_bright_indicator,@A_bg)
-        bg[ACTIVE] = @A_somewhat_bright_indicator
-	fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_somewhat_bright_indicator,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "mute_button" = "small_button"
 {
-	bg[NORMAL] = mix(0.1,@A_mute,@A_bg)
-        bg[ACTIVE] = @A_mute
-	fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_mute
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "mute_button_fullylit" = "small_button"
 {
         # this is the normal "active" state for a mute button
 
-	bg[ACTIVE] = @A_mute
-	bg[NORMAL] = @A_mute
-	bg[SELECTED] = @A_mute
-	bg[PRELIGHT] = lighter (@A_mute)
+	bg[ACTIVE] = @@COLPREFIX@_mute
+	bg[NORMAL] = @@COLPREFIX@_mute
+	bg[SELECTED] = @@COLPREFIX@_mute
+	bg[PRELIGHT] = lighter (@@COLPREFIX@_mute)
 
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] = @A_darkest
-	fg[NORMAL] = @A_darkest
-	fg[PRELIGHT] = @A_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
 }
 
 style "mute_button_halflit" = "small_button"
 {
- 	bg[NORMAL] = mix(0.5,@A_lightest,@A_mute)
- 	bg[SELECTED] = mix(0.5,@A_lightest,@A_mute)
- 	bg[ACTIVE] = mix(0.5,@A_lightest,@A_mute)
- 	bg[PRELIGHT] = mix(0.5,@A_lightest,@A_mute)
+ 	bg[NORMAL] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+ 	bg[SELECTED] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+ 	bg[ACTIVE] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+ 	bg[PRELIGHT] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
 
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] = @A_darkest
-	fg[NORMAL] = @A_darkest
-	fg[PRELIGHT] = @A_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
 }
 
 style "mixer_mute_button" = "mute_button"
@@ -621,14 +635,14 @@ style "multiline_combo" = "small_button"
 
 style "track_loop_button" = "small_button"
 {
-	bg[ACTIVE] = @A_somewhat_bright_indicator
-	bg[PRELIGHT] = lighter(@A_somewhat_bright_indicator)
+	bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	bg[PRELIGHT] = lighter(@@COLPREFIX@_somewhat_bright_indicator)
 
 }
 
 style "mixer_red_active_button" = "very_small_button"
 {
-	bg[ACTIVE] = @A_bright_indicator
+	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
 
  	base[INSENSITIVE] = { 0.16, 0.16, 0.21 }
  	bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
@@ -641,83 +655,83 @@ style "time_button" = "default_button"
 
 style "transport_button"
 {
-  #bg[NORMAL] = mix(0.05,@A_contrasting_indicator,@A_bg)   #turns out this is kind of yucky looking, but it's there if you want to try it
-	bg[ACTIVE] = @A_contrasting_indicator
-	fg[ACTIVE] = @A_darkest
+  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_contrasting_indicator,@@COLPREFIX@_bg)   #turns out this is kind of yucky looking, but it's there if you want to try it
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "transport_button_active"
 {
-	bg[NORMAL] = @A_contrasting_indicator
-	bg[ACTIVE] = @A_contrasting_indicator
-	bg[SELECTED] = @A_contrasting_indicator
-	bg[PRELIGHT] = @A_contrasting_indicator
+	bg[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	bg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+	bg[PRELIGHT] = @@COLPREFIX@_contrasting_indicator
 
-	fg[NORMAL] = @A_darkest
-	fg[PRELIGHT] = @A_darkest
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] = @A_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "transport_button_alternate_two"
 {
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] =   @A_darkest
-	fg[PRELIGHT] = @A_darkest
-	fg[NORMAL] = @A_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
 
-	bg[NORMAL] =   shade(0.2,@A_bright_indicator)
-	bg[ACTIVE] =   shade(0.2,@A_bright_indicator)
-	bg[SELECTED] =   shade(0.2,@A_bright_indicator)
-	bg[PRELIGHT] =   shade(0.2,@A_bright_indicator)
+	bg[NORMAL] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+	bg[ACTIVE] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+	bg[SELECTED] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+	bg[PRELIGHT] =   shade(0.2,@@COLPREFIX@_bright_indicator)
 }
 
 style "transport_rec_button"
 {
-	bg[ACTIVE] = darker(@A_arm)         #the rest of these don't quite do what I expected
-  #bg[NORMAL] = mix(0.05,@A_arm,@A_bg)
-	#bg[SELECTED] = darker(@A_arm)
-	#bg[PRELIGHT] = lighter(mix(0.05,@A_arm,@A_bg))
+	bg[ACTIVE] = darker(@@COLPREFIX@_arm)         #the rest of these don't quite do what I expected
+  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
+	#bg[SELECTED] = darker(@@COLPREFIX@_arm)
+	#bg[PRELIGHT] = lighter(mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
   
-  fg[ACTIVE] = @A_darkest
+  fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "transport_rec_button_active"
 {
-	bg[ACTIVE] = darker(@A_arm)
-	bg[NORMAL] = darker(@A_arm)
-	bg[SELECTED] = darker(@A_arm)
-	bg[PRELIGHT] = darker(@A_arm)
+	bg[ACTIVE] = darker(@@COLPREFIX@_arm)
+	bg[NORMAL] = darker(@@COLPREFIX@_arm)
+	bg[SELECTED] = darker(@@COLPREFIX@_arm)
+	bg[PRELIGHT] = darker(@@COLPREFIX@_arm)
 }
 
 style "transport_rec_button_alternate"
 {
-	bg[PRELIGHT] = @A_arm
-	bg[NORMAL] = @A_arm
-	bg[SELECTED] = @A_arm
-	bg[ACTIVE] = @A_arm
+	bg[PRELIGHT] = @@COLPREFIX@_arm
+	bg[NORMAL] = @@COLPREFIX@_arm
+	bg[SELECTED] = @@COLPREFIX@_arm
+	bg[ACTIVE] = @@COLPREFIX@_arm
 }
 
 style "shuttle_control" = "very_small_text"
 {
-	fg[NORMAL] = @A_control_text2
-	fg[ACTIVE] = @A_control_text2
-	fg[PRELIGHT] = @A_control_text2
-	fg[SELECTED] = @A_control_text2
-	fg[INSENSITIVE] = @A_control_text2
+	fg[NORMAL] = @@COLPREFIX@_control_text2
+	fg[ACTIVE] = @@COLPREFIX@_control_text2
+	fg[PRELIGHT] = @@COLPREFIX@_control_text2
+	fg[SELECTED] = @@COLPREFIX@_control_text2
+	fg[INSENSITIVE] = @@COLPREFIX@_control_text2
 
-	bg[NORMAL] = @A_darkest
-	bg[PRELIGHT] = @A_darkest
-	bg[INSENSITIVE] = @A_darkest
-	bg[ACTIVE] = @A_bright_color
-	bg[SELECTED] = @A_bright_color
+	bg[NORMAL] = @@COLPREFIX@_darkest
+	bg[PRELIGHT] = @@COLPREFIX@_darkest
+	bg[INSENSITIVE] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_bright_color
+	bg[SELECTED] = @@COLPREFIX@_bright_color
 }
 
 style "ardour_adjusters" = "default_generic"
 {
-	bg[NORMAL] = @A_bg
-	bg[PRELIGHT] = lighter(@A_bg)
-	bg[ACTIVE] = @A_darkest
+	bg[NORMAL] = @@COLPREFIX@_bg
+	bg[PRELIGHT] = lighter(@@COLPREFIX@_bg)
+	bg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "editor_hscrollbar" = "ardour_adjusters"
@@ -736,12 +750,12 @@ style "ardour_progressbars" = "default_generic"
 { 
   # Clearlooks always uses darkest for the advancing bar, sigh
   # so this is just a contrasting color for the trough
-  bg[NORMAL] = @A_bright_color
+  bg[NORMAL] = @@COLPREFIX@_bright_color
 }
 
 style "preferences"  = "default"
 {
-	fg[PRELIGHT] = lighter(@A_fg)
+	fg[PRELIGHT] = lighter(@@COLPREFIX@_fg)
 }
 
 style "option_entry"  = "default"
@@ -751,25 +765,25 @@ style "option_entry"  = "default"
 
 style "red_when_active" = "medium_text"
 {
-	fg[NORMAL] = @A_fg
-	bg[NORMAL] = @A_bg
-  bg[PRELIGHT] = @A_bg
+	fg[NORMAL] = @@COLPREFIX@_fg
+	bg[NORMAL] = @@COLPREFIX@_bg
+  bg[PRELIGHT] = @@COLPREFIX@_bg
 
-	fg[ACTIVE] = @A_fg
-	bg[ACTIVE] = @A_bright_indicator
-  bg[PRELIGHT] = @A_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_fg
+	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
+  bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
 }
 
 style "xrun_warn"  = "larger_bold_text"
 {
-	fg[NORMAL] = @A_fg
-	fg[ACTIVE] = @A_fg
-	text[NORMAL] = @A_fg
-	text[ACTIVE] = @A_fg
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_base
-	bg[NORMAL] = @A_bright_indicator
-	bg[ACTIVE] = @A_contrasting_indicator
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[ACTIVE] = @@COLPREFIX@_fg
+	text[NORMAL] = @@COLPREFIX@_fg
+	text[ACTIVE] = @@COLPREFIX@_fg
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	bg[NORMAL] = @@COLPREFIX@_bright_indicator
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
 }
 /*
 style "menu_bar_base" = "default"
@@ -779,242 +793,242 @@ style "menu_bar_base" = "default"
 */
 style "fatal_message" = "medium_text"
 {
-   fg[ACTIVE] = @A_bright_indicator
-   fg[NORMAL] = @A_bright_indicator
-   bg[ACTIVE]   = @A_base
-   bg[NORMAL]   = @A_base
-   base[NORMAL] = @A_base
-   base[NORMAL] = @A_base
+   fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+   fg[NORMAL] = @@COLPREFIX@_bright_indicator
+   bg[ACTIVE]   = @@COLPREFIX@_base
+   bg[NORMAL]   = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
 }
 
 style "error_message" = "medium_text"
 {
-   fg[ACTIVE] = @A_bright_indicator
-   fg[NORMAL] = @A_bright_indicator
-   bg[ACTIVE]   = @A_base
-   bg[NORMAL]   = @A_base
-   base[NORMAL] = @A_base
-   base[NORMAL] = @A_base
+   fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+   fg[NORMAL] = @@COLPREFIX@_bright_indicator
+   bg[ACTIVE]   = @@COLPREFIX@_base
+   bg[NORMAL]   = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
 }
 
 style "info_message" = "medium_text"
 {
-   fg[ACTIVE]   = @A_contrasting_indicator
-   fg[NORMAL]   = @A_contrasting_indicator
-   bg[ACTIVE]   = @A_base
-   bg[NORMAL]   = @A_base
-   base[NORMAL] = @A_base
-   base[NORMAL] = @A_base
+   fg[ACTIVE]   = @@COLPREFIX@_contrasting_indicator
+   fg[NORMAL]   = @@COLPREFIX@_contrasting_indicator
+   bg[ACTIVE]   = @@COLPREFIX@_base
+   bg[NORMAL]   = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
 }
 
 style "warning_message" = "medium_text"
 {
-   fg[ACTIVE] = @A_somewhat_bright_indicator
-   fg[NORMAL] = @A_somewhat_bright_indicator
-   bg[ACTIVE]   = @A_base
-   bg[NORMAL]   = @A_base
-   base[NORMAL] = @A_base
-   base[NORMAL] = @A_base
+   fg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+   fg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
+   bg[ACTIVE]   = @@COLPREFIX@_base
+   bg[NORMAL]   = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
 }
 
 style "medium_entry" = "medium_text"
 {
-	fg[NORMAL] = @A_text
-	fg[ACTIVE] = @A_text
-	fg[SELECTED] = @A_fg_selected
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
 	
-	bg[NORMAL] = @A_bg
+	bg[NORMAL] = @@COLPREFIX@_bg
 	
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_base
-	base[SELECTED] = @A_bg_selected
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "medium_entry_noselection_fg" = "medium_entry"
 {
-	fg[SELECTED] = @A_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
 }
 
 style "medium_entry_noselection_bg" = "medium_entry"
 {
-	bg[SELECTED] = @A_text
+	bg[SELECTED] = @@COLPREFIX@_text
 }
 
 style "medium_bold_entry"  = "medium_bold_text"
 {
-	fg[NORMAL] = @A_text
-	fg[ACTIVE] = @A_text
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
 	
-	bg[NORMAL] = @A_bg
+	bg[NORMAL] = @@COLPREFIX@_bg
 	
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_base
-	base[SELECTED] = @A_base
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_base
 }
 
 style "small_entry" = "small_text"
 {
-	fg[NORMAL] = @A_text
-	fg[ACTIVE] = @A_contrasting_indicator
-	fg[SELECTED] = @A_contrasting_indicator
-	text[NORMAL] = @A_text
-	text[ACTIVE] = @A_contrasting_indicator
-	text[SELECTED] = @A_fg_selected
-	bg[NORMAL] = @A_base
-	bg[SELECTED] = @A_base
-	bg[SELECTED] = @A_base
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_base
-	base[SELECTED] = @A_base
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+	bg[NORMAL] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_base
 }
 
 style "red_active_small_entry" = "small_entry"
 {
-	fg[ACTIVE] = @A_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
 style "small_bold_entry" = "small_bold_text"
 {
-	fg[NORMAL] = @A_text
-	fg[ACTIVE] = @A_text
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
 	
-	bg[NORMAL] = @A_bg
+	bg[NORMAL] = @@COLPREFIX@_bg
 	
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_base
-	base[SELECTED] = @A_base
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_base
 }
 
 style "small_red_on_black_entry"  = "small_bold_text"
 {
-       fg[NORMAL] = @A_bright_indicator
-       fg[ACTIVE] = @A_bright_indicator
-       base[NORMAL] = @A_base
-       base[ACTIVE] = @A_base
-       bg[NORMAL] = @A_base
-       bg[ACTIVE] = @A_base
+       fg[NORMAL] = @@COLPREFIX@_bright_indicator
+       fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+       base[NORMAL] = @@COLPREFIX@_base
+       base[ACTIVE] = @@COLPREFIX@_base
+       bg[NORMAL] = @@COLPREFIX@_base
+       bg[ACTIVE] = @@COLPREFIX@_base
 }
 
 style "non_recording_big_clock_display" = "medium_entry"
 {
 	font_name = "@FONT_MASSIVE@"
 
-	fg[NORMAL] = @A_control_text
-	fg[ACTIVE] = @A_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
-	fg[PRELIGHT] = @A_bright_indicator
-	fg[INSENSITIVE] = @A_bright_indicator
+	fg[NORMAL] = @@COLPREFIX@_control_text
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	fg[PRELIGHT] = @@COLPREFIX@_bright_indicator
+	fg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
 	
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_base
-	bg[NORMAL] = @A_base
-	bg[ACTIVE] = shade(0.5,@A_bright_indicator)
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	bg[NORMAL] = @@COLPREFIX@_base
+	bg[ACTIVE] = shade(0.5,@@COLPREFIX@_bright_indicator)
 }
 
 style "recording_big_clock_display" = "non_recording_big_clock_display"
 {
-	fg[NORMAL] = darker(@A_arm)
+	fg[NORMAL] = darker(@@COLPREFIX@_arm)
 }
 
 style "transport_clock_display"
 {
 	font_name = "@FONT_BOLD_BIGGER@"
 
-	fg[NORMAL] = darker (@A_contrasting_indicator)
-	fg[ACTIVE] = darker(@A_bright_indicator)
-	fg[SELECTED] = darker(@A_bright_indicator)
-	fg[PRELIGHT] = darker(@A_bright_indicator)
-	fg[INSENSITIVE] = darker(@A_bright_indicator)
+	fg[NORMAL] = darker (@@COLPREFIX@_contrasting_indicator)
+	fg[ACTIVE] = darker(@@COLPREFIX@_bright_indicator)
+	fg[SELECTED] = darker(@@COLPREFIX@_bright_indicator)
+	fg[PRELIGHT] = darker(@@COLPREFIX@_bright_indicator)
+	fg[INSENSITIVE] = darker(@@COLPREFIX@_bright_indicator)
 
-	base[NORMAL] = @A_darkest
-	base[ACTIVE] = @A_darkest
-	bg[NORMAL] = @A_darkest
-	bg[ACTIVE] = @A_darkest
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+	bg[NORMAL] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "transport_clock_display_delta" = "transport_clock_display"
 {
-	fg[NORMAL] = @A_bright_color
+	fg[NORMAL] = @@COLPREFIX@_bright_color
 }
 
 style "tempo_meter_clock_display" = "very_small_text"
 {
-	fg[NORMAL] = @A_fg
-	fg[ACTIVE] = @A_somewhat_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
-	base[NORMAL] = @A_base
-	base[ACTIVE] = @A_contrasting_indicator
-	bg[NORMAL] = @A_bright_color
-	bg[ACTIVE] = @A_contrasting_indicator
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	bg[NORMAL] = @@COLPREFIX@_bright_color
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
 }
 
 style "default_clock_display" = "medium_text"
 {
-	fg[NORMAL] = @A_contrasting_indicator
-	fg[ACTIVE] = @A_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
-	base[NORMAL] = @A_darkest
-	base[ACTIVE] = @A_darkest
-	bg[NORMAL] = @A_darkest
-	bg[ACTIVE] = @A_darkest
+	fg[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+	bg[NORMAL] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 
 style "white_on_black_clock_display" = "medium_text"
 {
-	fg[NORMAL] = @A_fg
-	fg[ACTIVE] = @A_bright_indicator
-	fg[SELECTED] = @A_bright_indicator
-	base[NORMAL] = @A_darkest
-	base[ACTIVE] = @A_darkest
-	bg[NORMAL] = @A_darkest
-	bg[ACTIVE] = @A_darkest
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+	bg[NORMAL] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "editor_time_ruler" = "small_text"
 {
-	fg[NORMAL] = @A_fg
-	bg[NORMAL] = @A_base
+	fg[NORMAL] = @@COLPREFIX@_fg
+	bg[NORMAL] = @@COLPREFIX@_base
 }
 
 style "audio_bus_base" = "very_small_text"
 {
-  fg[NORMAL] = @A_fg
-  bg[NORMAL] = @A_audio_bus
+  fg[NORMAL] = @@COLPREFIX@_fg
+  bg[NORMAL] = @@COLPREFIX@_audio_bus
 }
 
 style "send_strip_base" = "default"
 {
   font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @A_send_fg
-  bg[NORMAL] = @A_send_bg
-  bg[ACTIVE] = @A_send_bg
-  bg[PRELIGHT] = @A_send_bg
-  bg[INSENSITIVE] = @A_send_bg
-  bg[SELECTED] = @A_send_bg
+  fg[NORMAL] = @@COLPREFIX@_send_fg
+  bg[NORMAL] = @@COLPREFIX@_send_bg
+  bg[ACTIVE] = @@COLPREFIX@_send_bg
+  bg[PRELIGHT] = @@COLPREFIX@_send_bg
+  bg[INSENSITIVE] = @@COLPREFIX@_send_bg
+  bg[SELECTED] = @@COLPREFIX@_send_bg
 }
 
 style "audio_track_base" = "default"
 {
   font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @A_fg
-  bg[NORMAL] = @A_audio_track
-  bg[ACTIVE] = @A_bg
-  bg[PRELIGHT] = @A_bg
-  bg[INSENSITIVE] = @A_bg
-  bg[SELECTED] = @A_bg
+  fg[NORMAL] = @@COLPREFIX@_fg
+  bg[NORMAL] = @@COLPREFIX@_audio_track
+  bg[ACTIVE] = @@COLPREFIX@_bg
+  bg[PRELIGHT] = @@COLPREFIX@_bg
+  bg[INSENSITIVE] = @@COLPREFIX@_bg
+  bg[SELECTED] = @@COLPREFIX@_bg
 }
 
 style "midi_track_base" = "default"
 {
   font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @A_fg
-  bg[NORMAL] = @A_midi_track
-  bg[ACTIVE] = @A_bg
-  bg[PRELIGHT] = @A_bg
-  bg[INSENSITIVE] = @A_bg
-  bg[SELECTED] = @A_bg
+  fg[NORMAL] = @@COLPREFIX@_fg
+  bg[NORMAL] = @@COLPREFIX@_midi_track
+  bg[ACTIVE] = @@COLPREFIX@_bg
+  bg[PRELIGHT] = @@COLPREFIX@_bg
+  bg[INSENSITIVE] = @@COLPREFIX@_bg
+  bg[SELECTED] = @@COLPREFIX@_bg
 }
 
 style "track_controls_inactive" 
@@ -1050,25 +1064,25 @@ style "audio_bus_metrics_inactive" = "track_controls_inactive"
 
 style "track_name_display" = "medium_text"
 {
-	fg[NORMAL] = @A_fg
-	fg[ACTIVE] = @A_fg
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[ACTIVE] = @@COLPREFIX@_fg
 
-	base[NORMAL] = @A_base
-	base[ACTIVE] = lighter(@A_base)
-	bg[NORMAL] = lighter(@A_base)
-	bg[ACTIVE] = lighter(@A_base)
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = lighter(@@COLPREFIX@_base)
+	bg[NORMAL] = lighter(@@COLPREFIX@_base)
+	bg[ACTIVE] = lighter(@@COLPREFIX@_base)
 }
 
 style "active_track_name_display" = "medium_text"
 {
-	GtkWidget::cursor_color =  @A_base
-	text[NORMAL] = @A_base
-	base[NORMAL] = @A_text
+	GtkWidget::cursor_color =  @@COLPREFIX@_base
+	text[NORMAL] = @@COLPREFIX@_base
+	base[NORMAL] = @@COLPREFIX@_text
 }
 
 style "track_separator"
 {
-	bg[NORMAL] = @A_fg
+	bg[NORMAL] = @@COLPREFIX@_fg
 }
 
 #
@@ -1200,42 +1214,42 @@ style "plugin_slider"
 	#font_name ="bold @FONT_BIG@"
 
 	# the slider itself. the inactive part is INSENSITIVE,
-	# the active part is something else.
+	# the active part is taken from some other state.
 
-	fg[NORMAL] = @A_bright_color
-	fg[ACTIVE] = @A_bright_color
-	fg[INSENSITIVE] = @A_base # matches default
-	fg[SELECTED] = @A_bright_color
-	fg[PRELIGHT] = @A_bright_color
+	fg[NORMAL] = @@COLPREFIX@_bright_color
+	fg[ACTIVE] = @@COLPREFIX@_bright_color
+	fg[INSENSITIVE] = @@COLPREFIX@_base # matches default
+	fg[SELECTED] = @@COLPREFIX@_bright_color
+	fg[PRELIGHT] = @@COLPREFIX@_bright_color
 
 	# draws the outer rectangle around the slider
 
-	bg[NORMAL] = @A_base
-	bg[ACTIVE] = @A_base
-	bg[INSENSITIVE] = @A_base
-	bg[SELECTED] = @A_base
-	bg[PRELIGHT] = @A_base
+	bg[NORMAL] = shade (0.6, @@COLPREFIX@_lightest)
+	bg[ACTIVE] = shade (0.6, @@COLPREFIX@_lightest)
+	bg[INSENSITIVE] = shade (0.6, @@COLPREFIX@_lightest)
+	bg[SELECTED] = shade (0.6, @@COLPREFIX@_lightest)
+	bg[PRELIGHT] = shade (0.6, @@COLPREFIX@_lightest)
 
 	# the numeric display
 
-	text[NORMAL] = @A_text
-	text[ACTIVE] = @A_text
-	text[INSENSITIVE] = @A_text
-	text[SELECTED] = @A_text
-	text[PRELIGHT] = @A_text
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[INSENSITIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_text
+	text[PRELIGHT] = @@COLPREFIX@_text
 }
 
 style "track_list_display" = "small_bold_text"
 {
- 	text[NORMAL] = @A_text
-  text[ACTIVE] = darker(@A_text)
-  text[INSENSITIVE] = @A_base
-  text[SELECTED] = @A_fg_selected
+ 	text[NORMAL] = @@COLPREFIX@_text
+  text[ACTIVE] = darker(@@COLPREFIX@_text)
+  text[INSENSITIVE] = @@COLPREFIX@_base
+  text[SELECTED] = @@COLPREFIX@_fg_selected
 
-  base[NORMAL] = @A_base
-  base[ACTIVE] = lighter(@A_base)
-  base[INSENSITIVE] = darker(@A_base)
-  base[SELECTED] = @A_bg_selected
+  base[NORMAL] = @@COLPREFIX@_base
+  base[ACTIVE] = lighter(@@COLPREFIX@_base)
+  base[INSENSITIVE] = darker(@@COLPREFIX@_base)
+  base[SELECTED] = @@COLPREFIX@_bg_selected
 }
 
 style "inspector_track_list_display" = "track_list_display"
@@ -1245,9 +1259,9 @@ style "inspector_track_list_display" = "track_list_display"
 
 style "processor_list" = "very_small_text"
 {
-	bg[NORMAL] = { 0, 0, 0 }
-        bg[ACTIVE] = shade (1.8, @A_fg_selected)
-        fg[ACTIVE] = @A_darkest
+	bg[NORMAL] = @@COLPREFIX@_darkest
+        bg[ACTIVE] = shade (1.8, @@COLPREFIX@_fg_selected)
+        fg[ACTIVE] = @@COLPREFIX@_darkest
 	GtkCheckButton::indicator-size = 10
 	GtkCheckButton::indicator-spacing = 0
 }
@@ -1260,49 +1274,49 @@ style "inspector_processor_list" = "processor_list"
 # Colour of a processor frame when it is selected
 style "processor_frame_selected"
 {
-	bg[NORMAL] = @A_fg_selected
+	bg[NORMAL] = @@COLPREFIX@_fg_selected
 }
 
 # Colour of a processor frame when it is a send whose level is being controller by the fader
 style "processor_frame_active_send"
 {
-	bg[NORMAL] = @A_send_fg
+	bg[NORMAL] = @@COLPREFIX@_send_fg
 }
 
 # Fader processor's background
 style "processor_fader"
 {
-	bg[NORMAL] = @A_processor_fader_bg
+	bg[NORMAL] = @@COLPREFIX@_processor_fader_bg
 }
 
 # Fader processor's frame
-style "processor_fader_frame"
+style "processor_fader_frame" 
 {
-	bg[NORMAL] = @A_processor_fader_frame
+bg[NORMAL] = @@COLPREFIX@_processor_fader_frame
 }
 
 # Pre-fader processor's background
 style "processor_prefader"
 {
-	bg[NORMAL] = @A_processor_prefader
+	bg[NORMAL] = @@COLPREFIX@_processor_prefader
 }
 
 # Pre-fader processor's frame
 style "processor_prefader_frame"
 {
-	bg[NORMAL] = @A_processor_prefader_frame
+	bg[NORMAL] = @@COLPREFIX@_processor_prefader_frame
 }
 
 # Post-fader processor's background
 style "processor_postfader"
 {
-	bg[NORMAL] = @A_processor_postfader
+	bg[NORMAL] = @@COLPREFIX@_processor_postfader
 }
 
 # Post-fader processor's frame
 style "processor_postfader_frame"
 {
-	bg[NORMAL] = @A_processor_postfader_frame
+	bg[NORMAL] = @@COLPREFIX@_processor_postfader_frame
 }
 
 # MixerPanZone:
@@ -1312,43 +1326,43 @@ style "processor_postfader_frame"
 
 style "pan_zone" = "default"
 {
-	fg[NORMAL] = @A_contrasting_indicator
-	fg[ACTIVE] = darker(@A_bright_color)
+	fg[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	fg[ACTIVE] = darker(@@COLPREFIX@_bright_color)
 }
 
 style "paler_red_when_active" = "medium_text"
 {
-	fg[NORMAL] = @A_fg
-	fg[PRELIGHT] = @A_fg
-	bg[NORMAL] = @A_bg
-	bg[PRELIGHT] = @A_bg
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[PRELIGHT] = @@COLPREFIX@_fg
+	bg[NORMAL] = @@COLPREFIX@_bg
+	bg[PRELIGHT] = @@COLPREFIX@_bg
 
-	fg[ACTIVE] = @A_fg
-	bg[ACTIVE] = lighter(@A_bright_indicator)
+	fg[ACTIVE] = @@COLPREFIX@_fg
+	bg[ACTIVE] = lighter(@@COLPREFIX@_bright_indicator)
 }
 
 style "peak_display_peaked_entry" = "small_text"
 {
-	fg[NORMAL] = @A_text
-	fg[ACTIVE] = @A_text
-	fg[SELECTED] = @A_text
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[SELECTED] = @@COLPREFIX@_text
 
-        bg[NORMAL] = @A_bright_indicator
-        bg[ACTIVE] = @A_bright_indicator
-        bg[PRELIGHT] = @A_bright_indicator
-        bg[INSENSITIVE] = @A_bright_indicator
-        bg[SELECTED] = @A_bright_indicator
-        base[NORMAL] = @A_bright_indicator
-        base[ACTIVE] = @A_bright_indicator
-        base[PRELIGHT] = @A_bright_indicator
-        base[INSENSITIVE] = @A_bright_indicator
-        base[SELECTED] = @A_bright_indicator
+        bg[NORMAL] = @@COLPREFIX@_bright_indicator
+        bg[ACTIVE] = @@COLPREFIX@_bright_indicator
+        bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
+        bg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
+        bg[SELECTED] = @@COLPREFIX@_bright_indicator
+        base[NORMAL] = @@COLPREFIX@_bright_indicator
+        base[ACTIVE] = @@COLPREFIX@_bright_indicator
+        base[PRELIGHT] = @@COLPREFIX@_bright_indicator
+        base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
+        base[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
 style "selected_strip_frame"
 {
-	fg[NORMAL] = @A_bright_indicator
-	bg[NORMAL] = darker(@A_bright_indicator)
+	fg[NORMAL] = @@COLPREFIX@_bright_indicator
+	bg[NORMAL] = darker(@@COLPREFIX@_bright_indicator)
 }
 
 style "flashing_alert" = "very_small_text"
@@ -1356,13 +1370,13 @@ style "flashing_alert" = "very_small_text"
 	GtkButton::child-displacement-x = 0
         GtkButton::child-displacement-y = 0
   
-        fg[NORMAL] = darker(@A_fg)
-        fg[PRELIGHT] = darker(@A_fg)
-        bg[NORMAL] = mix(0.1,@A_bright_indicator,darker(@A_bg))
-        bg[PRELIGHT] = mix(0.1,@A_bright_indicator,darker(@A_bg))
+        fg[NORMAL] = darker(@@COLPREFIX@_fg)
+        fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
+        bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
+        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
         
-	fg[ACTIVE] = @A_fg
-	bg[ACTIVE] = @A_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_fg
+	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
 }
 
 
@@ -1371,13 +1385,13 @@ style "green_flashing_alert" = "very_small_text"
 	GtkButton::child-displacement-x = 0
         GtkButton::child-displacement-y = 0
 
-	fg[NORMAL] = darker(@A_fg)
-        fg[PRELIGHT] = darker(@A_fg)
-	bg[NORMAL] = mix(0.1,@A_contrasting_indicator,darker(@A_bg))
-        bg[PRELIGHT] = mix(0.1,@A_contrasting_indicator,darker(@A_bg))
+	fg[NORMAL] = darker(@@COLPREFIX@_fg)
+        fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_contrasting_indicator,darker(@@COLPREFIX@_bg))
+        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_contrasting_indicator,darker(@@COLPREFIX@_bg))
 
-	fg[ACTIVE] = @A_fg
-	bg[ACTIVE] = @A_contrasting_indicator
+	fg[ACTIVE] = @@COLPREFIX@_fg
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
 }
 
 style "sync_alert"
@@ -1387,23 +1401,23 @@ style "sync_alert"
 	# active, and alternates with another style if sync is active
 	# but we are not locked
 	#
-	bg[ACTIVE] = @A_somewhat_bright_indicator
-	bg[PRELIGHT] = @A_somewhat_bright_indicator
-	bg[SELECTED] = @A_somewhat_bright_indicator
-	bg[NORMAL] = @A_somewhat_bright_indicator
+	bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	bg[PRELIGHT] = @@COLPREFIX@_somewhat_bright_indicator
+	bg[SELECTED] = @@COLPREFIX@_somewhat_bright_indicator
+	bg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
 	
-	fg[NORMAL] = @A_darkest
-	fg[PRELIGHT] = @A_darkest
-	fg[SELECTED] = @A_darkest
-	fg[ACTIVE] = @A_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
 }
 
 style "tearoff_arrow" = "medium_bold_entry"
 {
-	fg[NORMAL] = darker(@A_fg)
-	fg[PRELIGHT] = darker(@A_fg)
-	bg[NORMAL] = darker(@A_fg)
-	bg[PRELIGHT] = darker(@A_fg)
+	fg[NORMAL] = darker(@@COLPREFIX@_fg)
+	fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
+	bg[NORMAL] = darker(@@COLPREFIX@_fg)
+	bg[PRELIGHT] = darker(@@COLPREFIX@_fg)
 }
 
 style "location_row_button" = "default_button"
@@ -1427,6 +1441,7 @@ style "padded_button" = "default_button"
 	xthickness = 8
 }
 
+
 #---------------------------------------------------------------
 
 class "GtkWidget" style:highest "default"
@@ -1596,6 +1611,8 @@ widget "*TakeSelector" style:highest "medium_entry"
 widget "*RegionSelector" style:highest "medium_entry"
 widget "*SMPTERuler" style:highest "editor_time_ruler"
 widget "*BBTRuler" style:highest "editor_time_ruler"
+widget "*SamplesRuler" style:highest "editor_time_ruler"
+widget "*TimecodeRuler" style:highest "editor_time_ruler"
 widget "*FramesRuler" style:highest "editor_time_ruler"
 widget "*MinSecRuler" style:highest "editor_time_ruler"
 widget "*BaseFrame" style:highest "base_frame"
@@ -1639,7 +1656,7 @@ widget "*CrossfadeEditCurveButton" style:highest "red_when_active"
 widget "*CrossfadeEditCurveButton*" style:highest "red_when_active"
 widget "*CrossfadeEditLabel" style:highest "medium_text"
 widget "*CrossfadeEditFrame" style:highest "base_frame"
-widget "*MouseModeButton" style:highest "default_button"
+widget "*MouseModeButton" style:highest "mouse_mode_button"
 widget "*MouseModeButton*" style:highest "default_button"
 widget "*EditorMainCanvas" style:highest "main_canvas_area"
 widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
@@ -1812,6 +1829,8 @@ widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
 widget "*SoloIsolatedLED" style:highest "solo_isolate_led"
 widget "*SoloSafeLED" style:highest "solo_safe_led"
 widget "*SoloLEDLabel" style:highest "very_small_text"
+widget "*ContrastingPopup" style:highest "contrasting_popup"
+widget "*ContrastingPopup*" style:highest "contrasting_popup"
 
 widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
 widget "*RegionNameEditorEntry" style:highest "text_cell_entry"