lots of tricks & tweaks related to the monitor section and All That It Uses
[ardour.git] / gtk2_ardour / ardour3_ui_dark.rc.in
index 271cf1a7567d703d85aff1c7f93543b23653d353..2ec1f56eeea348e9bca723e19d1bcea23c9b771e 100644 (file)
@@ -4,27 +4,32 @@
 
 style "very_small_text"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
 }
 
 style "small_text"
 {
-       font_name = "%FONT_SMALL%"
+       font_name = "@FONT_SMALL@"
 }
 
 style "small_bold_text"
 {
-       font_name = "%FONT_BOLD_SMALL%"
+       font_name = "@FONT_BOLD_SMALL@"
 }
 
 style "medium_bold_text"
 {
-       font_name = "%FONT_BOLD_NORMAL%"
+       font_name = "@FONT_BOLD_NORMAL@"
 }
 
 style "medium_text"
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_NORMAL@"
+}
+
+style "medium_monospace_text"
+{
+       font_name = "@FONT_MONOSPACE_NORMAL@"
 }
 
 style "red_medium_text" = "medium_text"
@@ -36,54 +41,98 @@ style "red_medium_text" = "medium_text"
 
 style "large_text"
 {
-       font_name = "%FONT_LARGE%"
+       font_name = "@FONT_LARGE@"
 }
 
 style "larger_bold_text"
 {
-       font_name = "%FONT_BOLD_BIGGER%"
+       font_name = "@FONT_BOLD_BIGGER@"
 }
 
 style "plugin_name_text"
 {
-       font_name = "%FONT_BOLD_LARGER%"
+       font_name = "@FONT_BOLD_LARGER@"
        fg[NORMAL] = { 0.80, 0.80, 0.80 }
 }
 
 style "plugin_maker_text"
 {
-       font_name = "%FONT_BOLD_BIGGER%"
+       font_name = "@FONT_BOLD_BIGGER@"
        fg[NORMAL] = { 0.80, 0.80, 0.80 }
 }
 
 style "automation_track_name"
 {
-       font_name = "%FONT_ITALIC_NORMAL%"
+       font_name = "@FONT_ITALIC_NORMAL@"
 }
 
 style "first_action_message" 
 {
-       font_name = "%FONT_HUGER%"
+       font_name = "@FONT_HUGER@"
 }
 
 style "verbose_canvas_cursor"
 {
-       font_name = "%FONT_BOLD_LARGER%"
+       font_name = "@FONT_BOLD_LARGER@"
 }
 
 style "marker_text" 
 {
-       font_name = "%FONT_SMALL%"
+       font_name = "@FONT_SMALL@"
+}
+
+style "midi_tracer_textview" = "medium_monospace_text"
+{
+       
 }
 
 style "time_axis_view_item_name"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
 }
 
-style "default_base" = "medium_text"
+style "white_tree_view" 
 {
+  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 = { 0.70, 0.70, 0.70 }
+  GtkTreeView::odd-row-color = { 0.64, 0.64, 0.64 }
   
+  fg[NORMAL] = { 0.30, 0.30, 0.40 }    
+  fg[ACTIVE] = { 0.30, 0.30, 0.40 }    
+  fg[PRELIGHT] = { 1.0, 1.0, 1.0 }
+  fg[INSENSITIVE] = { 0.30, 0.30, 0.40 }       
+  fg[SELECTED] = { 0.30, 0.30, 0.40 }  
+  
+  bg[NORMAL] = { 0.80, 0.80, 0.80 }
+  bg[ACTIVE] = { 0.80, 0.80, 0.80 }
+  bg[PRELIGHT] = { 0.80, 0.80, 0.80 }
+  bg[INSENSITIVE] = { 0.80, 0.80, 0.80 }
+  bg[SELECTED] = { 0.80, 0.80, 0.80 }
+  
+  text[NORMAL] = { 0.30, 0.30, 0.40 }
+  text[ACTIVE] = { 0.30, 0.30, 0.40 }
+  text[PRELIGHT] = { 0.30, 0.30, 0.40 }
+  text[INSENSITIVE] = { 0.30, 0.30, 0.40 }
+  text[SELECTED] = { 0, 0, 0 }
+  
+  base[ACTIVE]       = { 0.80, 0.80, 0.80 }
+  base[NORMAL]       = { 0.80, 0.80, 0.80 }
+  base[PRELIGHT]     = { 0.90, 0.90, 0.90 }
+  base[INSENSITIVE]  = "#4c5159"
+  base[SELECTED]     = { 0.60, 0.60, 0.80 }
+
+  engine "clearlooks" 
+  {
+    menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient
+  }
+}
+
+style "default_base" = "medium_text"
+{
   GtkWidget::cursor_color =  {1.0, 1.0, 1.0 }
   GtkButton::default_border = { 0, 0, 0, 0 }
   GtkButton::default_outside_border = { 0, 0, 0, 0 }
@@ -91,7 +140,7 @@ style "default_base" = "medium_text"
   GtkTreeView::vertical-padding = 0
   GtkTreeView::horizontal-padding = 0
   GtkTreeView::even-row-color = { 0, 0, 0 }
-  GtkTreeView::odd-row-color = {  0.08, 0.10, 0.15 }
+  GtkTreeView::odd-row-color = {  0.08, 0.10, 0.14 }
   
   fg[NORMAL] = { 0.80, 0.80, 0.80 }    
   fg[ACTIVE] = { 0.80, 0.80, 0.80 }    
@@ -99,9 +148,9 @@ style "default_base" = "medium_text"
   fg[INSENSITIVE] = { 0.80, 0.80, 0.80 }       
   fg[SELECTED] = { 0.80, 0.80, 0.80 }  
   
-  bg[NORMAL] = { 0.31, 0.35, 0.40 }
-  bg[ACTIVE] = { 0.31, 0.35, 0.40 }
-  bg[PRELIGHT] = "#515690"
+  bg[NORMAL] = { 0.30, 0.32, 0.38 }
+  bg[ACTIVE] = { 0.30, 0.32, 0.38 }
+  bg[PRELIGHT] = "#515290"
   bg[INSENSITIVE] = { 0.06, 0.10, 0.10 }
   bg[SELECTED] = { 0, 0.40, 0.60 }
   
@@ -111,27 +160,25 @@ style "default_base" = "medium_text"
   text[INSENSITIVE] = { 0.80, 0.80, 0.80}      
   text[SELECTED] = { 1.0, 1.0, 1.0 }
   
-  base[ACTIVE]     = "#272a2f"
-  base[NORMAL]      =  "#1a1e20"
-  base[PRELIGHT]     = { 0.18, 0.20, 0.20 }
+  base[ACTIVE]       = "#272a32"
+  base[NORMAL]       = "#1a1e24"
+  base[PRELIGHT]     = { 0.18, 0.20, 0.22 }
   base[INSENSITIVE]  = "#4c5159"
-  base[SELECTED]     = { 0.23, 0.25, 0.25 }
+  base[SELECTED]     = { 0.23, 0.25, 0.27 }
 
   engine "clearlooks" 
   {
-    menubarstyle       = 0       # 0 = flat, 1 = sunken, 2 = flat gradient
-    style              = GLOSSY
-    colorize_scrollbar = TRUE
+    #style              = GLOSSY
+    #colorize_scrollbar = TRUE
     menubarstyle       = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
-    toolbarstyle       = 0 # 0 = flat, 1 = enable effects
-
+    #toolbarstyle       = 0 # 0 = flat, 1 = enable effects
   }
 }
 
 style "base_frame"
 {
        fg[NORMAL] = { 0.80, 0.80, 0.80 }
-       bg[NORMAL] = { 0.35, 0.35, 0.40 }
+       bg[NORMAL] = { 0.31, 0.35, 0.40 }
 }
 
 style "transport_base" = "medium_bold_text"
@@ -145,31 +192,57 @@ style "transport_base" = "medium_bold_text"
 /*
 style "black_mackie_menu_bar"
 {
-  font_name = "%FONT_BOLD_NORMAL%"
+  font_name = "@FONT_BOLD_NORMAL@"
   fg[NORMAL] = { 1.0, 1.0, 1.0 }
   bg[NORMAL] = { 0, 0, 0 }
 }
 */
-style "default_buttons_menus" 
+
+style "default_button" 
+{
+  font_name = "@FONT_SMALL@"
+  fg[ACTIVE] = { 1.0, 1.0, 1.0 }
+  
+  bg[NORMAL] = { 0.33, 0.37, 0.42 }
+  bg[ACTIVE] = "#565690"
+  bg[PRELIGHT] = { 0.49, 0.53, 0.59 }
+  bg[INSENSITIVE] = { 0.31, 0.35, 0.36 }
+  fg[INSENSITIVE] = { 0.61, 0.65, 0.67 }
+  bg[SELECTED] = { 0.11, 0.15, 0.19 }  
+}
+
+style "default_menu" 
 {
-  font_name = "%FONT_NORMAL%"
+  font_name = "@FONT_NORMAL@"
   fg[ACTIVE] = { 1.0, 1.0, 1.0 }
   
-  bg[NORMAL] = { 0.30, 0.30, 0.35 }
+  bg[NORMAL] = { 0.26, 0.30, 0.35 }
   bg[ACTIVE] = "#565690"
-  bg[PRELIGHT] = { 0.15, 0.15, 0.20 }
-  bg[INSENSITIVE] = { 0.15, 0.15, 0.20 }
-  bg[SELECTED] = { 0.15, 0.15, 0.20 }  
+  bg[PRELIGHT] = { 0.11, 0.15, 0.20 }
+  bg[INSENSITIVE] = { 0.11, 0.15, 0.20 }
+  bg[SELECTED] = { 0.11, 0.15, 0.20 }  
 }
 
-style "very_small_button" = "default_buttons_menus"
+style "default_generic" 
 {
-       font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_NORMAL@"
+  fg[ACTIVE] = { 1.0, 1.0, 1.0 }
+  
+  bg[NORMAL] = { 0.26, 0.30, 0.35 }
+  bg[ACTIVE] = "#545690"
+  bg[PRELIGHT] = { 0.11, 0.15, 0.20 }
+  bg[INSENSITIVE] = { 0.11, 0.15, 0.20 }
+  bg[SELECTED] = { 0.11, 0.15, 0.20 }  
+}
+
+style "very_small_button" = "default_button"
+{
+       font_name = "@FONT_SMALLER@"
        ythickness = 0
        xthickness = 0
 }
 
-style "small_button" = "default_buttons_menus"
+style "small_button" = "default_button"
 {
 }
 
@@ -225,21 +298,21 @@ style "track_rec_enable_button_alternate" = "small_button"
 
 style "mixer_track_rec_enable_button" = "track_rec_enable_button"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 
 style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 
 style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
@@ -277,25 +350,24 @@ style "solo_button_active" = "small_button"
 
 style "mixer_solo_button" = "solo_button"
 {
-       font_name = "%FONT_SMALLERER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 
 style "mixer_solo_button_alternate" = "solo_button_alternate"
 {
-       font_name = "%FONT_SMALLERER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 style "mixer_solo_button_active" = "solo_button_active"
 {
-       font_name = "%FONT_SMALLERER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 
-
 style "mute_button" = "small_button"
 {
 }
@@ -326,37 +398,30 @@ style "mute_button_active" = "small_button"
        fg[PRELIGHT] = { 0, 0, 0 }
 }
 
-style "mixer_mute_button" = "mute_button"
-{
-       font_name = "%FONT_SMALLERER%"
-       xthickness = 0
-       ythickness = 0
-}
-
 style "mixer_mute_button_alternate" = "mute_button_alternate"
 {
-       font_name = "%FONT_SMALLERER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 
 style "mixer_mute_button_active" = "mute_button_active"
 {
-       font_name = "%FONT_SMALLERER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
 
 style "multiline_combo" = "small_button"
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_NORMAL@"
        xthickness = 0
        ythickness = 0
 }
 
 style "mixer_mute_button" = "mute_button"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
        xthickness = 0
        ythickness = 0
 }
@@ -377,9 +442,9 @@ style "mixer_red_active_button" = "very_small_button"
        bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
 }
 
-style "time_button" = "default_buttons_menus"
+style "time_button" = "default_button"
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_SMALL@"
 }
 
 style "transport_button"
@@ -434,7 +499,7 @@ style "shuttle_control" = "very_small_text"
        bg[SELECTED] = { 1.0, 0.04, 0.04 }
 }
 
-style "ardour_adjusters" = "default_buttons_menus"
+style "ardour_adjusters" = "default_generic"
 {
        bg[NORMAL] = { 0.60, 0.60, 0.60 }
        bg[PRELIGHT] = { 0.80, 0.80, 0.80 }
@@ -453,7 +518,7 @@ style "editor_hscrollbar" = "ardour_adjusters"
        GtkScrollbar::slider_width = 27
 }
 
-style "ardour_progressbars" = "default_buttons_menus"
+style "ardour_progressbars" = "default_generic"
 { 
   bg[NORMAL] = { 0, 0, 0 }
   bg[PRELIGHT] = { 0.00, 0.36, 0.40 }
@@ -461,7 +526,7 @@ style "ardour_progressbars" = "default_buttons_menus"
 
 style "preferences"  = "default_base"
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_NORMAL@"
        fg[PRELIGHT] = { 0.80, 0.80, 0.80 }
 }
 
@@ -488,7 +553,7 @@ style "red_when_active" = "medium_text"
 
 style "xrun_warn"  
 {
-       font_name = "%FONT_BOLD_LARGE%"
+       font_name = "@FONT_BOLD_LARGE@"
 
        fg[NORMAL] = { 1.0, 1.0, 1.0 }
        fg[ACTIVE] = { 1.0, 1.0, 1.0 }
@@ -511,42 +576,42 @@ style "menu_bar_base" = "default_base"
 */
 style "fatal_message" = "medium_text"
 {
-   fg[ACTIVE] = { 1.0, 0, 1.0 }
-   fg[NORMAL] = { 0.80, 0.80, 0.80 }
-   bg[ACTIVE] = { 0,0,0 }
-   bg[NORMAL] = { 0,0,0 }
-   base[ACTIVE] = { 0,0,0 }
-   base[NORMAL] = { 0,0,0 }
+   fg[ACTIVE] = { 1.0, 0.20, 0.20 }
+   fg[NORMAL] = { 1.0, 0.20, 0.20 }
+   bg[ACTIVE]   = "#1a1e24"
+   bg[NORMAL]   = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
 }
 
 style "error_message" = "medium_text"
 {
-   fg[ACTIVE] = { 1.0, 00 }
-   fg[NORMAL] = { 0.80, 0.80, 0.80 }
-   bg[ACTIVE] = { 0,0,0 }
-   bg[NORMAL] = { 0,0,0 }
-   base[ACTIVE] = { 0,0,0 }
-   base[NORMAL] = { 0,0,0 }
+   fg[ACTIVE] = { 1.0, 0.20, 0.20 }
+   fg[NORMAL] = { 1.0, 0.20, 0.20 }
+   bg[ACTIVE]   = "#1a1e24"
+   bg[NORMAL]   = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
 }
 
 style "info_message" = "medium_text"
 {
-   fg[ACTIVE] = { 1.0, 0, 0 }
-   fg[NORMAL] = { 0.80, 0.80, 0.80 }
-   bg[ACTIVE] = { 0,0,0 }
-   bg[NORMAL] = { 0,0,0 }
-   base[ACTIVE] = { 0,0,0 }
-   base[NORMAL] = { 0,0,0 }
+   fg[ACTIVE]   = { 0.20, 0.80, 0.20 }
+   fg[NORMAL]   = { 0.20, 0.80, 0.20 }
+   bg[ACTIVE]   = "#1a1e24"
+   bg[NORMAL]   = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
 }
 
 style "warning_message" = "medium_text"
 {
-   fg[ACTIVE] = { 0.30,0.30, 1.0 }
-   fg[NORMAL] = { 0.80, 0.80, 0.80 }
-   bg[ACTIVE] = { 0, 0, 0 }
-   bg[NORMAL] = { 0, 0, 0 }
-   base[ACTIVE] = { 0, 0, 0 }
-   base[NORMAL] = { 0, 0, 0 }
+   fg[ACTIVE] = { 0.80, 0.80, 0.20 }
+   fg[NORMAL] = { 0.80, 0.80, 0.20 }
+   bg[ACTIVE]   = "#1a1e24"
+   bg[NORMAL]   = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
+   base[NORMAL] = "#1a1e24"
 }
 
 style "medium_entry" = "medium_text"
@@ -630,7 +695,7 @@ style "small_red_on_black_entry"  = "small_bold_text"
 
 style "non_recording_big_clock_display" = "medium_entry"
 {
-       font_name = "%FONT_MASSIVE%"
+       font_name = "@FONT_MASSIVE@"
 
        fg[NORMAL] = { 0.50, 1.0, 0.50 }
        fg[ACTIVE] = { 1.0, 0, 0.0 }
@@ -651,7 +716,7 @@ style "recording_big_clock_display" = "non_recording_big_clock_display"
 
 style "transport_clock_display"
 {
-       font_name = "%FONT_BOLD_BIGGER%"
+       font_name = "@FONT_BOLD_BIGGER@"
        
        fg[NORMAL] = { 0.50, 1.0, 0.50 }
        fg[ACTIVE] = { 1.0, 0, 0.0 }
@@ -672,7 +737,7 @@ style "transport_clock_display_delta" = "transport_clock_display"
 
 style "tempo_meter_clock_display"
 {
-       font_name = "%FONT_SMALLER%"
+       font_name = "@FONT_SMALLER@"
        fg[NORMAL] = { 1.0, 1.0, 1.0 }
        fg[ACTIVE] = { 1.0, 1.0, 0.0 }
        fg[SELECTED] = { 1.0, 0, 0 }
@@ -693,6 +758,18 @@ style "default_clock_display" = "medium text"
        bg[ACTIVE] = { 0, 0, 0 }
 }
 
+
+style "white_on_black_clock_display" = "medium text"
+{
+       fg[NORMAL] = { 1.0, 1.0, 1.0 }
+       fg[ACTIVE] = { 1.0, 0.0, 0.0 }
+       fg[SELECTED] = { 1.0, 0, 0 }
+       base[NORMAL] = { 0, 0, 0 }
+       base[ACTIVE] = { 0, 0, 0 }
+       bg[NORMAL] = { 0, 0, 0 }
+       bg[ACTIVE] = { 0, 0, 0 }
+}
+
 style "editor_time_ruler" = "small_text"
 {
        fg[NORMAL] = { 0.80, 0.80, 0.80 }
@@ -701,37 +778,39 @@ style "editor_time_ruler" = "small_text"
 
 style "audio_bus_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }    
   fg[NORMAL] = { 0.7, 0.8, 0.2 }       
-  bg[NORMAL] = { 0.20, 0.20, 0.26 }    
+  bg[NORMAL] = "#363c45"
+}
+
+style "send_strip_base" = "default_base"
+{
+  font_name = "@FONT_SMALLER@"
+  fg[NORMAL] = { 0.77, 0.77, 0.72 }    
+  bg[NORMAL] = { 0.19, 0.97, 0.69 }    
+  bg[ACTIVE] = { 0.19, 0.97, 0.69 }    
+  bg[PRELIGHT] = { 0.19, 0.97, 0.69 }  
+  bg[INSENSITIVE] = { 0.19, 0.97, 0.69 }       
+  bg[SELECTED] = { 0.19, 0.97, 0.69 }  
 }
 
 style "audio_track_base" = "default_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }    
-  bg[NORMAL] = { 0.18, 0.19, 0.22 }
+  bg[NORMAL] = "#43546e"
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }    
   bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
   bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
   bg[SELECTED] = { 0.20, 0.20, 0.20 }
 }
 
-style "midi_bus_base"
-{
-  font_name = "%FONT_SMALLER%"
-  fg[NORMAL] = { 0.77, 0.77, 0.72 }    
-  fg[NORMAL] = { 0.7, 0.8, 0.2 }       
-  #bg[NORMAL] = {0, 0.36, 0.40 }
-  bg[NORMAL] = "#444466"       
-}
-
 style "midi_track_base" = "default_base"
 {
-  font_name = "%FONT_SMALLER%"
+  font_name = "@FONT_SMALLER@"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }    
-  bg[NORMAL] = { 0.48, 0.30, 0.32 }
+  bg[NORMAL] = "#546e43"
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }    
   bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
   bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
@@ -752,27 +831,27 @@ style "track_controls_inactive"
 
 style "audio_track_metrics" = "audio_track_base"
 {
-       font_name = "%FONT_TINY%"
+       font_name = "@FONT_TINY@"
 }
 
 style "audio_bus_metrics" = "audio_bus_base"
 {
-       font_name = "%FONT_TINY%"
+       font_name = "@FONT_TINY@"
 }
 
 style "audio_track_metrics_inactive" = "track_controls_inactive"
 {
-       font_name = "%FONT_TINY%"
+       font_name = "@FONT_TINY@"
 }
 
 style "audio_bus_metrics_inactive" = "track_controls_inactive"
 {
-       font_name = "%FONT_TINY%"
+       font_name = "@FONT_TINY@"
 }
 
 style "track_name_display"
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_NORMAL@"
        fg[NORMAL] = { 0.80, 0.80, 0.80 }
        fg[ACTIVE] = { 0.80, 0.80, 0.80 }
 
@@ -784,7 +863,8 @@ style "track_name_display"
 
 style "active_track_name_display"
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_NORMAL@"
+       GtkWidget::cursor_color =  {0, 0, 0 }
        text[NORMAL] = { 0.26, 0.26, 0.26 }
        base[NORMAL] = { 0.89, 0.89, 0.89 }
 }
@@ -846,32 +926,37 @@ style "edit_group_3"
 style "treeview_parent_node"
 {
        # specifies *just* the color used for whole file rows when not selected
+       
        fg[NORMAL] = { 0.0, 0.6, 0.85 }
 }
 
 style "treeview_display" = "small_bold_text"
 {
+       GtkWidget::focus-line-width = 0
+
        # expander arrow border and DnD "icon" text
        fg[NORMAL] = { 0.8, 0.8, 0.8 } 
 
+       bg[NORMAL] = { 0.8, 0.8, 0.8 }
+
        # background with no rows or no selection, plus
        # expander arrow core and DnD "icon" background
        base[NORMAL] = { 0.20, 0.20, 0.25 }
 
        # selected row bg when window does not have focus (including during DnD)
-       base[ACTIVE] = { 0.0, 0.60, 0.60 }    
+       base[ACTIVE] = { 0.0, 0.75, 0.75 }    
 
        # selected row bg when window has focus
-       base[SELECTED] = { 0, 0.75, 0.75 }
+       base[SELECTED] = { 0, 0.75, 0.75 }
 
        # row text when in normal state and not a parent
        text[NORMAL] = { 0.80, 0.80, 0.80 }
 
        # selected row text with window focus
-       text[SELECTED] = { 0, 1.0, 1.0 }  
+       text[SELECTED] = { 1.0, 1.0, 1.0 }  
 
        # selected row text without window focus (including during DnD)
-       text[ACTIVE] = { 0, 1.0, 1.0 }  
+       text[ACTIVE] = { 1.0, 1.0, 1.0 }  
 }
 
 style "main_canvas_area"
@@ -891,7 +976,7 @@ style "track_controls_inactive"
        bg[SELECTED] =    { 0.60, 0.60, 0.66 }
        bg[PRELIGHT] =    { 0.60, 0.60, 0.66 }
 
-       font_name = "%FONT_LARGE%"
+       font_name = "@FONT_LARGE@"
        fg[NORMAL] = { 0.7, 0.8, 0.2 }  
 }
 
@@ -916,7 +1001,7 @@ style "automation_track_controls_base"
 # Plugin Editors
 style "plugin_slider" 
 {
-       font_name ="%FONT_BOLD_BIG%"
+       font_name ="@FONT_BOLD_BIG@"
 
        # the slider itself. the inactive part is INSENSITIVE,
        # the active part is something else.
@@ -967,30 +1052,32 @@ style "inspector_track_list_display" = "track_list_display"
        base[SELECTED] = { 0.3, 0.3, 0.4 }
 }
 
-style "redirect_list_display"
+style "processor_list_display"
 {
-       GtkTreeView::horizontal-separator = 0
-       GtkTreeView::vertical-separator = 0
+       # font_name = "@FONT_SMALL@"
+       # text[NORMAL] = { 0.80, 0.80, 0.80 }
+       # text[ACTIVE] = { 0.70, 0.70, 0.70 }
+       # text[INSENSITIVE] = { 0, 0, 0 }
+       # text[SELECTED] = { 0.9, 0.3, 0.3 }
 
-       font_name = "%FONT_SMALL%"
-       text[NORMAL] = { 0.80, 0.80, 0.80 }
-       text[ACTIVE] = { 0.70, 0.70, 0.70 }
-       text[INSENSITIVE] = { 0, 0, 0 }
-       text[SELECTED] = { 0.9, 0.3, 0.3 }
+       # base[NORMAL] = { 0, 0, 0 }
+       # base[ACTIVE] = { 0, 0, 0 }
+       # base[INSENSITIVE] = { 0, 0, 0 }
+       # base[SELECTED] = { 0, 0, 0 }
 
-       base[NORMAL] = { 0, 0, 0 }
-       base[ACTIVE] = { 0, 0, 0 }
-       base[INSENSITIVE] = { 0, 0, 0 }
-       base[SELECTED] = { 0, 0, 0 }
+       # # these two are explicitly used by the cell renderer for the
+        # # text
 
-       # these two are explicitly used by the cell renderer for the
-        # text
+       # fg[NORMAL] = { 0.5, 0.5, 0.5 }  # used for inactive
+       # fg[ACTIVE] = { 1.0, 1.0, 1.0 }  # used for active
 
-       fg[NORMAL] = { 0.5, 0.5, 0.5 }  # used for inactive
-       fg[ACTIVE] = { 1.0, 1.0, 1.0 }  # used for active
+       font_name = "@FONT_SMALLER@"
+       bg[NORMAL] = { 0, 0, 0 }
+       GtkCheckButton::indicator-size = 10
+       GtkCheckButton::indicator-spacing = 0
 }
 
-style "inspector_redirect_list_display" = "redirect_list_display"
+style "inspector_processor_list_display" = "processor_list_display"
 {
        base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
@@ -1045,11 +1132,39 @@ style "flashing_alert" = "very_small_text"
 {
        fg[NORMAL] = { 0.80, 0.80, 0.80 }
        bg[NORMAL] = { 0.26, 0.26, 0.31 }
-
+        
        fg[ACTIVE] = { 0.80, 0.80, 0.80 }
        bg[ACTIVE] = { 1.0, 0, 0}
 }
 
+
+style "green_flashing_alert" = "very_small_text"
+{
+       fg[NORMAL] = { 0.80, 0.80, 0.80 }
+       bg[NORMAL] = { 0.26, 0.26, 0.31 }
+
+       fg[ACTIVE] = { 0.80, 0.80, 0.80 }
+       bg[ACTIVE] = { 0.52, 1.0, 0}
+}
+
+style "sync_alert"
+{
+       #
+       # this is used when the sync button is indicating that sync is
+       # active, and alternates with another style if sync is active
+       # but we are not locked
+       #
+       bg[ACTIVE] = { 0.52, 1.0, 0}
+       bg[PRELIGHT] = { 0.52, 1.0, 0}
+       bg[SELECTED] = { 0.52, 1.0, 0}
+       bg[NORMAL] = { 0.52, 1.0, 0}
+       
+       fg[NORMAL] = { 0, 0, 0 }
+       fg[PRELIGHT] = { 0, 0, 0 }
+       fg[SELECTED] = { 0, 0, 0 }
+       fg[ACTIVE] = { 0, 0, 0 }
+}
+
 style "selected_io_selector_port_list" = "medium_bold_text"
 {
 
@@ -1124,7 +1239,7 @@ style "io_selector_port_list" = "medium_text"
 style "io_selector_notebook" = "default_base"
 {
        fg[NORMAL] = { 1.0, 1.0, 1.0 }
-        font_name ="%FONT_BOLD_NORMAL%"
+        font_name ="@FONT_BOLD_NORMAL@"
 }
 
 style "tearoff_arrow" = "medium_bold_entry"
@@ -1135,19 +1250,19 @@ style "tearoff_arrow" = "medium_bold_entry"
        bg[PRELIGHT] = { 0.80, 0.80, 0.80 }
 }
 
-style "location_row_button" = "default_buttons_menus"
+style "location_row_button" = "default_button"
 {
-       font_name = "%FONT_BIG%"
+       font_name = "@FONT_NORMAL@"
 }
 
 style "location_rows_clock" = "default_clock_display"
 {
-       font_name = "%FONT_BIG%"
+       font_name = "@FONT_NORMAL@"
 }
 
 style "pan_slider" 
 {
-       font_name = "%FONT_NORMAL%"
+       font_name = "@FONT_NORMAL@"
 
        fg[NORMAL] = { 0.22, 0.73, 0.22 }
        fg[ACTIVE] = { 0.22, 0.73, 0.22 }
@@ -1177,64 +1292,72 @@ style "pan_slider"
 
 }
 
-style "ardour_button" ="default_buttons_menus"
+style "ardour_button" ="default_button"
 {
        xthickness = 1
        ythickness = 1
 }
 
+style "padded_button" = "default_button"
+{
+       xthickness = 8
+}
+
+style "odd_port_groups"
+{
+       fg[NORMAL] = { 0.6, 0.6, 0.6 }
+}
+
+style "even_port_groups"
+{
+       fg[NORMAL] = { 0.3, 0.3, 0.3 }
+}
+
 #---------------------------------------------------------------
 
 class "GtkWidget" style:highest "default_base"
 class "GtkScrollbar" style:highest "ardour_adjusters"
-class "GtkLabel" style:highest "default_buttons_menus"
+class "GtkLabel" style:highest "default_generic"
 class "GtkButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
+widget "*PaddedButton" style:highest "padded_button"
 widget "*FirstActionMessage" style:highest "first_action_message"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
 widget "*TimeAxisViewItemName*" style:highest "time_axis_view_item_name"
-#widget "*ExportProgress" style:highest "default_buttons_menus"
-widget "*ExportFileLabel" style:highest "small_bold_text"
-widget "*ExportFormatLabel" style:highest "medium_bold_text"
-widget "*ExportHeader" style:highest "small_bold_text"
-widget "*ExportFileDisplay" style:highest "medium_entry"
-widget "*ExportFormatDisplay" style:highest "medium_entry"
-widget "*ExportCheckbox" style:highest "small_entry"
-widget "*ExportTrackSelector*" style:highest "medium_entry_noselection_bg"
 widget "*EditModeSelector" style:highest "medium_bold_entry"
 widget "*SnapTypeSelector" style:highest "medium_bold_entry"
 widget "*SnapModeSelector" style:highest "medium_bold_entry"
 widget "*ZoomFocusSelector" style:highest "medium_bold_entry"
-widget "*ArdourContextMenu*" style:highest "default_buttons_menus"
-widget "*EditGroupTitleButton*" style:highest "default_buttons_menus"
-widget "*MixerGroupTitleButton*" style:highest "default_buttons_menus"
-widget "*ErrorLogCloseButton" style:highest "default_buttons_menus"
-widget "*EditorGTKButton*" style:highest "default_buttons_menus
-widget "*ToolbarButton" style:highest "default_buttons_menus"
-widget "*ToolbarButton*" style:highest "default_buttons_menus"
-widget "*CrossfadeEditButton" style:highest "default_buttons_menus"
-widget "*CrossfadeEditButton*" style:highest "default_buttons_menus"
-widget "*TrackHistoryButton*" style:highest "default_buttons_menus"
-widget "*TrackSizeButton*" style:highest "default_buttons_menus"
-widget "*TrackPlaylistButton*" style:highest "default_buttons_menus"
-widget "*TrackAutomationButton*" style:highest "default_buttons_menus"
-widget "*TrackGroupButton*" style:highest "default_buttons_menus"
-widget "*TrackMixButton*" style:highest "default_buttons_menus"
-widget "*TrackVisualButton*" style:highest "default_buttons_menus"
-widget "*TrackRemoveButton*" style:highest "default_buttons_menus"
-widget "*BaseButton" style:highest "default_buttons_menus"
-widget "*TakeButtonLabel" style:highest "default_buttons_menus"
-widget "*MixerWidthButton" style:highest "default_buttons_menus"
-widget "*MixerHideButton" style:highest "default_buttons_menus"
-widget "*MixerSendButton" style:highest "default_buttons_menus"
-widget "*MixerSendButtonLabel" style:highest "default_buttons_menus"
-widget "*MixerSendSwitch" style:highest "default_buttons_menus"
-widget "*MixerInsertButton" style:highest "default_buttons_menus"
-widget "*MixerInsertButtonLabel" style:highest "default_buttons_menus"
-widget "*MixerInsertSwitch" style:highest "default_buttons_menus"
+widget "*ArdourContextMenu*" style:highest "default_menu"
+widget "*EditGroupTitleButton*" style:highest "default_button"
+widget "*MixerGroupTitleButton*" style:highest "default_button"
+widget "*ErrorLogCloseButton" style:highest "default_button"
+widget "*EditorGTKButton*" style:highest "default_button" 
+widget "*ToolbarButton" style:highest "default_button"
+widget "*ToolbarButton*" style:highest "default_button"
+widget "*CrossfadeEditButton" style:highest "default_button"
+widget "*CrossfadeEditButton*" style:highest "default_button"
+widget "*TrackHistoryButton*" style:highest "default_button"
+widget "*TrackSizeButton*" style:highest "default_button"
+widget "*TrackPlaylistButton*" style:highest "default_button"
+widget "*TrackAutomationButton*" style:highest "default_button"
+widget "*TrackGroupButton*" style:highest "default_button"
+widget "*TrackMixButton*" style:highest "default_button"
+widget "*TrackVisualButton*" style:highest "default_button"
+widget "*TrackRemoveButton*" style:highest "default_button"
+widget "*BaseButton" style:highest "default_button"
+widget "*TakeButtonLabel" style:highest "default_button"
+widget "*MixerWidthButton" style:highest "default_button"
+widget "*MixerHideButton" style:highest "default_button"
+widget "*MixerSendButton" style:highest "default_button"
+widget "*MixerSendButtonLabel" style:highest "default_button"
+widget "*MixerSendSwitch" style:highest "default_button"
+widget "*MixerInsertButton" style:highest "default_button"
+widget "*MixerInsertButtonLabel" style:highest "default_button"
+widget "*MixerInsertSwitch" style:highest "default_button"
 widget "*MixerMonitorInputButton*" style:highest "very_small_button"
 widget "*MixerMonitorInputButton.*" style:highest "very_small_button"
 widget "*MixerIOButton" style:highest "very_small_button"
@@ -1287,10 +1410,15 @@ widget "*MixerGroupButton" style:highest "very_small_button"
 widget "*MixerGroupButtonLabel" style:highest "very_small_button"
 widget "*MixerCommentButton" style:highest "very_small_button"
 widget "*MixerCommentButton*" style:highest "very_small_button"
+widget "*MixerMonoButton*" style:highest "very_small_button"
 widget "*EditGroupButton" style:highest "very_small_button"
 widget "*EditGroupButtonLabel" style:highest "very_small_button"
 widget "*TransportButton" style:highest "transport_rec_button"
 widget "*TransportButton-active" style:highest "transport_button_active"
+widget "*TransportSyncButton" style:highest "transport_button"
+widget "*TransportSyncButton*" style:highest "transport_button"
+widget "*TransportSyncButton-active" style:highest "sync_alert"
+widget "*TransportSyncButton-active*" style:highest "sync_alert"
 widget "*ShuttleButton" style:highest "transport_button"
 widget "*ShuttleButton*" style:highest "transport_button"
 widget "*ShuttleDisplay" style:highest "transport_button"
@@ -1305,7 +1433,7 @@ widget "*TransportRecButton-alternate*" style:highest "transport_rec_button_alte
 widget "*TransportRecButton*" style:highest "transport_rec_button"
 widget "*RecordingXrunWarningWindow" style:highest "xrun_warn"
 widget "*RecordingXrunWarningWindow*" style:highest "xrun_warn"
-/*widget "*MainMenuBar" style:highest "menu_bar_base"*/
+#widget "*MainMenuBar" style:highest "menu_bar_base"
 widget "*ErrorMessage" style:highest "error_message"
 widget "*FatalMessage" style:highest "fatal_message"
 widget "*InfoMessage" style:highest "info_message"
@@ -1324,6 +1452,7 @@ widget "*AudioClockBBTUpperInfo" style:highest "tempo_meter_clock_display"
 widget "*AudioClockBBTLowerInfo" style:highest "tempo_meter_clock_display"
 widget "*SelectionStartClock" style:highest "default_clock_display"
 widget "*SelectionEndClock" style:highest "default_clock_display"
+widget "*SilenceDurationClock" style:highest "white_on_black_clock_display"
 widget "*EditPointClock" style:highest "default_clock_display"
 widget "*PreRollClock" style:highest "default_clock_display"
 widget "*PostRollClock" style:highest "default_clock_display"
@@ -1338,7 +1467,7 @@ widget "*TakeTagLabel" style:highest "small_bold_text"
 widget "*ToolBarLabel" style:highest "small_bold_text"
 widget "*EditorDisplayLabel" style:highest "small_bold_text"
 widget "*NewSessionLabel" style:highest "large_text"
-widget "*GlobalButtonLabel" style:highest "default_buttons_menus"
+widget "*GlobalButtonLabel" style:highest "default_generic"
 widget "*ClickButton" style:highest "medium_entry"
 widget "*RegionNameDisplay" style:highest "medium_entry"
 widget "*PluginDisplay" style:highest "medium_entry"
@@ -1353,6 +1482,7 @@ widget "*FramesRuler" style:highest "editor_time_ruler"
 widget "*MinSecRuler" style:highest "editor_time_ruler"
 widget "*BaseFrame" style:highest "base_frame"
 
+widget "*SendStripBase" style:highest "send_strip_base"
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
 widget "*AudioBusStripBase" style:highest "audio_bus_base"
 widget "*MidiTrackStripBase" style:highest "midi_track_base"
@@ -1391,8 +1521,8 @@ 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_buttons_menus"
-widget "*MouseModeButton*" style:highest "default_buttons_menus"
+widget "*MouseModeButton" style:highest "default_button"
+widget "*MouseModeButton*" style:highest "default_button"
 widget "*EditorMainCanvas" style:highest "main_canvas_area"
 widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
 widget "*BusControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
@@ -1406,9 +1536,8 @@ widget "*MidiTrackControlsBaseSelected" style:highest "edit_controls_base_select
 widget "*BusControlsBaseSelected" style:highest "edit_controls_base_selected"
 widget "*AutomationTrackControlsBase" style:highest "automation_track_controls_base"
 widget "*AutomationTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
-/*widget "*EditorMenuBar*" style:highest "black_mackie_menu_bar"
-widget "*MainMenuBar*" style:highest "black_mackie_menu_bar"
-*/
+#widget "*EditorMenuBar*" style:highest "black_mackie_menu_bar"
+#widget "*MainMenuBar*" style:highest "black_mackie_menu_bar"
 widget "*ZoomClickBox" style:highest "medium_bold_entry"
 widget "*PluginParameterLabel" style:highest "medium_text"
 widget "*PluginNameInfo" style:highest "plugin_name_text"
@@ -1419,8 +1548,6 @@ widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
 widget "*PluginUIClickBox" style:highest "medium_bold_entry"
 widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
 widget "*PluginSlider" style:highest "plugin_slider"
-widget "*RedirectSelector" style:highest "redirect_list_display"
-widget "*RedirectSelector.*" style:highest "redirect_list_display"
 widget "*EditGroupDisplay" style:highest "treeview_display"
 widget "*TrackListDisplay" style:highest "treeview_display"
 widget "*RegionListDisplay" style:highest "treeview_display"
@@ -1458,12 +1585,16 @@ widget "*BypassButton" style:highest "red_when_active"
 widget "*BypassButton*" style:highest "red_when_active"
 widget "*TransportSoloAlert" style:highest "flashing_alert"
 widget "*TransportSoloAlert.*" style:highest "flashing_alert"
+widget "*TransportSoloAlert-active" style:highest "flashing_alert"
+widget "*TransportSoloAlert-alternate" style:highest "flashing_alert"
+widget "*SendAlert" style:highest "green_flashing_alert"
+widget "*SendAlert.*" style:highest "green_flashing_alert"
 widget "*TransportAuditioningAlert" style:highest "flashing_alert"
 widget "*TransportAuditioningAlert.*" style:highest "flashing_alert"
 widget "*FadeCurve" style:highest "medium_bold_entry"
 widget "*FadeCurve*" style:highest "medium_bold_entry"
-widget "*IOSelectorButton" style:highest "default_buttons_menus"
-widget "*IOSelectorButton*" style:highest "default_buttons_menus"
+widget "*IOSelectorButton" style:highest "default_button"
+widget "*IOSelectorButton*" style:highest "default_button"
 widget "*IOSelectorList" style:highest "medium_entry_noselection_fg"
 widget "*IOSelectorPortList" style:highest "io_selector_port_list"
 widget "*IOSelectorPortList.*" style:highest "io_selector_port_list"
@@ -1472,8 +1603,8 @@ widget "*IOSelectorPortListSelected.*" style:highest "selected_io_selector_port_
 widget "*IOSelectorNotebook" style:highest "io_selector_notebook"
 widget "*IOSelectorNotebookTab" style:highest "io_selector_notebook"
 widget "*IOSelectorFrame" style:highest "base_frame"
-widget "*ConnectionEditorButton" style:highest "default_buttons_menus"
-widget "*ConnectionEditorButton*" style:highest "default_buttons_menus"
+widget "*ConnectionEditorButton" style:highest "default_button"
+widget "*ConnectionEditorButton*" style:highest "default_button"
 widget "*ConnectionEditorList" style:highest "medium_entry_noselection_fg"
 widget "*ConnectionEditorConnectionList" style:highest "medium_entry"
 widget "*ConnectionEditorPortList" style:highest "io_selector_port_list"
@@ -1482,8 +1613,8 @@ widget "*ConnectionEditorNotebook" style:highest "io_selector_notebook"
 widget "*ConnectionEditorNotebookTab" style:highest "io_selector_notebook"
 widget "*ConnectionEditorFrame" style:highest "base_frame"
 widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
-widget "*RouteParamsPreListDisplay" style:highest "inspector_redirect_list_display"
-widget "*RouteParamsPostListDisplay" style:highest "inspector_redirect_list_display"
+widget "*RouteParamsPreListDisplay" style:highest "inspector_processor_list_display"
+widget "*RouteParamsPostListDisplay" style:highest "inspector_processor_list_display"
 widget "*TearOffArrow" style:highest "tearoff_arrow"
 widget "*RouteParamsTitleButton" style:highest "medium_text"
 widget "*RouteParamsTitleLabel" style:highest "medium_text"
@@ -1500,18 +1631,18 @@ widget "*PluginLoadButton*" style:highest "small_button"
 
 widget "*MetricDialogFrame" style:highest "base_frame"
 widget "*MetricEntry" style:highest "medium_bold_entry"
-widget "*MetricButton" style:highest "default_buttons_menus"
-widget "*MetricButton.*" style:highest "default_buttons_menus"
+widget "*MetricButton" style:highest "default_button"
+widget "*MetricButton.*" style:highest "default_button"
 widget "*MetricLabel" style:highest "medium_text"
-widget "*TimeStretchButton" style:highest "default_buttons_menus"
-widget "*TimeStretchButton.*" style:highest "default_buttons_menus"
-widget "*TimeStretchProgress" style:highest "default_buttons_menus"
-widget "*ChoiceWindow" style:highest "default_buttons_menus"
-widget "*ChoicePrompt" style:highest "default_buttons_menus"
-widget "*ChoiceButton" style:highest "default_buttons_menus"
-widget "*ChoiceButton*" style:highest "default_buttons_menus"
-widget "*SelectionModeButton" style:highest "default_buttons_menus"
-widget "*SelectionModeButton*" style:highest "default_buttons_menus"
+widget "*TimeStretchButton" style:highest "default_button"
+widget "*TimeStretchButton.*" style:highest "default_button"
+widget "*TimeStretchProgress" style:highest "default_generic"
+widget "*ChoiceWindow" style:highest "default_generic"
+widget "*ChoicePrompt" style:highest "default_generic"
+widget "*ChoiceButton" style:highest "default_button"
+widget "*ChoiceButton*" style:highest "default_button"
+widget "*SelectionModeButton" style:highest "default_button"
+widget "*SelectionModeButton*" style:highest "default_button"
 widget "*TrackLabel" style:highest "medium_text"
 widget "*TrackPlugName" style:highest "medium_text"
 widget "*TrackParameterName" style:highest "small_text"
@@ -1521,7 +1652,7 @@ widget "*AddRouteDialogChannelChoice" style:highest "medium_bold_entry"
 widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
 widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
 widget "*AddRouteDialogRadioButton" style:highest "red_when_active"
-widget "*AddRouteDialogButton" style:highest "default_buttons_menus"
+widget "*AddRouteDialogButton" style:highest "default_button"
 widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
 widget "*NewSessionIOLabel" style:highest "larger_bold_text"
 widget "*NewSessionSR1Label" style:highest "red_medium_text"
@@ -1544,10 +1675,10 @@ widget "*LocationEditNumberLabel" style:highest "small_text"
 widget "*LocationLocEditorFrame" style:highest "base_frame"
 widget "*LocationRangeEditorFrame" style:highest "base_frame"
 widget "*LocationEditNameEntry" style:highest "option_entry"
-widget "*LocationAddLocationButton" style:highest "default_buttons_menus"
-widget "*LocationAddLocationButton*" style:highest "default_buttons_menus"
-widget "*LocationAddRangeButton" style:highest "default_buttons_menus"
-widget "*LocationAddRangeButton*" style:highest "default_buttons_menus"
+widget "*LocationAddLocationButton" style:highest "default_button"
+widget "*LocationAddLocationButton*" style:highest "default_button"
+widget "*LocationAddRangeButton" style:highest "default_button"
+widget "*LocationAddRangeButton*" style:highest "default_button"
 widget "*LocationEditRemoveButton" style:highest "location_row_button"
 widget "*LocationEditRemoveButton*" style:highest "location_row_button"
 widget "*PanSlider" style:highest "pan_slider"
@@ -1556,7 +1687,12 @@ widget "*PanningLinkButton.*" style:highest "mixer_red_active_button"
 widget "*PanningLinkDirectionButton" style:highest "very_small_button"
 widget "*PanningLinkDirectionButton.*" style:highest "very_small_button"
 widget "*ChannelCountSelector" style:highest "medium_bold_entry"
-widget "*ChannelCountSelector.GtkArrow" style:highest "default_buttons_menus"
+widget "*ChannelCountSelector.GtkArrow" style:highest "default_generic"
 widget "*RegionListWholeFile" style:highest "treeview_parent_node"
 widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
-
+widget "*OddPortGroups" style:highest "odd_port_groups"
+widget "*EvenPortGroups" style:highest "even_port_groups"
+widget "*MidiListView*" style:highest "white_tree_view"
+widget "*ProcessorSelector*" style:highest "processor_list_display"
+widget "*PortMatrixLabel*" style:highest "small_text"
+widget "*MidiTracerTextView" style:highest "midi_tracer_textview"