X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour2_ui.rc;h=a0fe615eaf08154d87c46409e4f34f2f20e57a9b;hb=0caf05d8016cc199dbd28373688317278ec9ec82;hp=e5ec742ac76ee61b74baf82c082d8b7230c76e53;hpb=6097ce578b9dc4d51f421c2e4cca2de64948aa66;p=ardour.git

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index e5ec742ac7..a0fe615eaf 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -58,6 +58,11 @@ style "plugin_maker_text"
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
 }
 
+style "automation_track_name"
+{
+	font_name = "sans italic 8"
+}
+
 style "first_action_message" 
 {
 	font_name = "sans medium 34"
@@ -75,20 +80,28 @@ style "marker_text"
 
 style "time_axis_view_item_name"
 {
-	font_name = "sans medium 10"
+	font_name = "sans 6"
 }
 
 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 }
+  GtkTreeView::vertical-padding = 0
+  GtkTreeView::horizontal-padding = 0
+  GtkTreeView::even-row-color = { 0, 0, 0 }
+  GtkTreeView::odd-row-color = { 0, 0, 0 }
+  
   fg[NORMAL] = { 0.80, 0.80, 0.80 }	
   fg[ACTIVE] = { 0.80, 0.80, 0.80 }	
-  fg[PRELIGHT] = { 0.50, 1.0, 1.0 }
+  fg[PRELIGHT] = { 1.0, 1.0, 1.0 }
   fg[INSENSITIVE] = { 0.80, 0.80, 0.80 }	
   fg[SELECTED] = { 0.80, 0.80, 0.80 }	
   
-  bg[NORMAL] = { 0.40, 0.40, 0.40 }
-  bg[ACTIVE] = { 0.40, 0.40, 0.40 }
-  bg[PRELIGHT] = { 0.40, 0.40, 0.40 }
+  bg[NORMAL] = { 0.35, 0.35, 0.40 }
+  bg[ACTIVE] = { 0.35, 0.35, 0.40 }
+  bg[PRELIGHT] = "#565690"
   bg[INSENSITIVE] = { 0.10, 0.10, 0.10 }
   bg[SELECTED] = { 0, 0.40, 0.60 }
   
@@ -98,17 +111,25 @@ style "default_base" = "medium_text"
   text[INSENSITIVE] = { 0.80, 0.80, 0.80}	
   text[SELECTED] = { 1.0, 1.0, 1.0 }
   
-  base[ACTIVE]     = "#2f272f"
-  base[NORMAL]      =  "#1c1e21"
+  base[ACTIVE]     = "#272a2f"
+  base[NORMAL]      =  "#1a1e20"
   base[PRELIGHT]     = { 0.20, 0.20, 0.20 }
   base[INSENSITIVE]  = "#4c5159"
   base[SELECTED]     = { 0.25, 0.25, 0.25 }
+
+  engine "clearlooks" 
+  {
+    menubarstyle      = 2       # 0 = flat, 1 = sunken, 2 = flat gradient
+    menuitemstyle     = 1       # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button)
+    listviewitemstyle = 1       # 0 = flat, 1 = 3d-ish (gradient)
+    progressbarstyle  = 1       # 0 = candy bar, 1 = fancy candy bar, 2 = flat
+  }
 }
 
 style "base_frame"
 {
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
-	bg[NORMAL] = { 0.40, 0.40, 0.40 }
+	bg[NORMAL] = { 0.35, 0.35, 0.40 }
 }
 
 style "transport_base" = "medium_bold_text"
@@ -120,27 +141,30 @@ style "transport_base" = "medium_bold_text"
   bg[SELECTED] = { 0, 0, 0 }
 }
 
-style "black_mackie_menu_bar" = "medium_bold_text"
+style "black_mackie_menu_bar"
 {
-      fg[NORMAL] = { 1.0, 1.0, 1.0 }
-      bg[NORMAL] = { 0, 0, 0 }
+  font_name = "sans bold 9"
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+  bg[NORMAL] = { 0, 0, 0 }
 }
 
 style "default_buttons_menus" 
 {
   font_name = "sans 8"
-  fg[ACTIVE] = { 0, 0, 0 }
+  fg[ACTIVE] = { 1.0, 1.0, 1.0 }
   
-  bg[NORMAL] = { 0.35, 0.35, 0.35 }
-  bg[ACTIVE] = { 0.50, 1.0, 1.0 }
-  bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
-  bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
-  bg[SELECTED] = { 0.20, 0.20, 0.20 }	
+  bg[NORMAL] = { 0.30, 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 }	
 }
 
 style "very_small_button" = "default_buttons_menus"
 {
 	font_name = "sans 7"
+	ythickness = 0
+	xthickness = 0
 }
 
 style "small_button" = "default_buttons_menus"
@@ -171,9 +195,17 @@ style "track_rec_enable_button" = "small_button"
 	bg[PRELIGHT] =   { 1.0, 0.0, 0.0 }
 }
 
+style "gain_fader"
+{
+	bg[NORMAL] =   { 0.269, 0.269, 0.300}
+	bg[ACTIVE] =   { 0.152, 0.152, 0.168 }
+}
+
 style "mixer_rec_enable_button" = "track_rec_enable_button"
 {
 	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
 }
 
 style "solo_button" = "small_button"
@@ -185,9 +217,29 @@ style "solo_button" = "small_button"
 	fg[ACTIVE] = { 0, 0, 0 }
 }
 
+style "safe_solo_button" = "small_button"
+{
+	bg[PRELIGHT] = { 0, 1.0, 0 }
+	bg[ACTIVE] = { 0.19, 0.97, 0.69 }
+
+	fg[PRELIGHT] = { 0, 0, 0 }
+	fg[ACTIVE] = { 0, 0, 0 }
+}
+
 style "mixer_solo_button" = "solo_button"
 {
 	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+
+}
+
+style "mixer_safe_solo_button" = "safe_solo_button"
+{
+	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
+
 }
 
 
@@ -197,11 +249,22 @@ style "mute_button" = "small_button"
 	bg[ACTIVE] = { 1.0, 0.98, 0.53 }
 	
 	fg[PRELIGHT] = { 0, 0, 0 }
+	fg[ACTIVE] = { 0, 0, 0 }
+}
+
+
+style "multiline_combo" = "small_button"
+{
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
 }
 
 style "mixer_mute_button" = "mute_button"
 {
 	font_name = "sans 7"
+	xthickness = 0
+	ythickness = 0
 }
 
 style "track_loop_button" = "small_button"
@@ -216,8 +279,8 @@ style "mixer_red_active_button" = "very_small_button"
 	fg[ACTIVE] = { 0, 1.0, 1.0 }
 	bg[ACTIVE] = { 0.7, 0, 0 }
 
- 	base[INSENSITIVE] = { 0.21, 0.21, 0.21 }
- 	bg[INSENSITIVE] = { 0.21, 0.21, 0.21 }
+ 	base[INSENSITIVE] = { 0.16, 0.16, 0.21 }
+ 	bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
 }
 
 style "time_button" = "default_buttons_menus"
@@ -228,6 +291,7 @@ style "time_button" = "default_buttons_menus"
 style "transport_button"
 {
 	bg[ACTIVE] = { 0.50, 1.0, 0.50 }
+	fg[ACTIVE] = { 0, 0, 0 }
 }
 
 style "transport_rec_button"
@@ -244,10 +308,10 @@ style "shuttle_control" = "very_small_text"
 	fg[SELECTED] = { 0.85, 0.92, 0.98 }
 	fg[INSENSITIVE] = { 0.85, 0.92, 0.98 }
 
-	bg[NORMAL] = { 0.31, 0.31, 0.31 }
-	bg[PRELIGHT] = { 0.31, 0.31, 0.31 }
-	bg[INSENSITIVE] = { 0.31, 0.31, 0.31 }
-	bg[ACTIVE] = { 0.50, 1.0, 0.50 }
+	bg[NORMAL] = { 0.26, 0.26, 0.31 }
+	bg[PRELIGHT] = { 0.26, 0.26, 0.31 }
+	bg[INSENSITIVE] = { 0.26, 0.26, 0.31 }
+	bg[ACTIVE] = { 0.70, 0.70, 0.70 }
 	bg[SELECTED] = { 1.0, 0.04, 0.04 }
 }
 
@@ -272,20 +336,20 @@ style "options_window"  = "default_base"
 
 style "option_entry"  = "default_base"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
-	fg[ACTIVE] = { 0.50, 1.0, 1.0 }
+	fg[NORMAL] = { 1.0, 1.0, 1.0 }
+	fg[ACTIVE] = { 1.0, 1.0, 1.0 }
 	fg[INSENSITIVE] = { 0.80, 0.80, 0.80 }
 	
-	base[INSENSITIVE] = { 0.12, 0.12, 0.12 }
+	base[INSENSITIVE] = { 0.07, 0.07, 0.12 }
 	
-	bg[NORMAL] = { 0.40, 0.40, 0.40 }
-	bg[ACTIVE] = { 0.40, 0.40, 0.40 }
+	bg[NORMAL] = { 0.35, 0.35, 0.40 }
+	bg[ACTIVE] = { 0.35, 0.35, 0.40 }
 }
 
 style "red_when_active" = "medium_text"
 {
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
-	bg[NORMAL] = { 0.31, 0.31, 0.31 }
+	bg[NORMAL] = { 0.26, 0.26, 0.31 }
 
 	fg[ACTIVE] = { 0.80, 0.80, 0.80 }
 	bg[ACTIVE] = { 1.0, 0, 0}
@@ -305,13 +369,13 @@ style "xrun_warn"
 	bg[ACTIVE] = { 0.09, 1.0, 0.46 }
 }
 
-style "menu_bar_base"
+style "menu_bar_base" = "default_base"
 {
-  bg[NORMAL] = { 0, 0, 0 }	
-  bg[ACTIVE] = { 0, 0, 0 }
-  bg[PRELIGHT] = { 0, 0, 0 }
-  bg[INSENSITIVE] = { 0, 0, 0 }
-  bg[SELECTED] = { 0, 0, 0 }
+	bg[NORMAL] = { 0.2, 0.2, 0.3 }
+	bg[ACTIVE] = { 0, 0, 0 }
+	bg[PRELIGHT] = { 0, 0, 0 }
+	bg[INSENSITIVE] = { 0, 0, 0 }
+	bg[SELECTED] = { 0, 0, 0 }
 }
 
 style "fatal_message" = "medium_text"
@@ -356,45 +420,50 @@ style "warning_message" = "medium_text"
 
 style "medium_entry" = "medium_text"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
-	fg[ACTIVE] = { 0.50, 1.0, 1.0 }
-	fg[SELECTED] = { 0.50, 1.0, 0.50 }
+	fg[NORMAL] = { 0.70, 0.70, 0.70 }
+	fg[ACTIVE] = { 0.70, 0.70, 0.70 }
+	fg[SELECTED] = { 1.0, 1.0, 1.0 }
 	
-	bg[NORMAL] = { 0.40, 0.40, 0.40 }
+	bg[NORMAL] = { 0.35, 0.35, 0.40 }
 	
 	base[NORMAL] = { 0, 0, 0 }
 	base[ACTIVE] = { 0, 0, 0 }
-	base[SELECTED] = { 0, 0, 0 }
+	base[SELECTED] = { 0.70, 0.70, 0.70 }
 }
 
 style "medium_entry_noselection_fg" = "medium_entry"
 {
-	fg[SELECTED] = { 0.50, 1.0, 1.0 }
+	fg[SELECTED] = { 0.50, 1.0, 0.50 }
 }
 
 style "medium_entry_noselection_bg" = "medium_entry"
 {
-	bg[SELECTED] = { 0, 0, 0 }
+	bg[SELECTED] = { 1.0, 1.0, 1.0 }
 }
 
 style "medium_bold_entry"  = "medium_bold_text"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
-	fg[ACTIVE] = { 0.50, 1.0, 1.0 }
+	fg[NORMAL] = { 0.70, 0.70, 0.70 }
+	fg[ACTIVE] = { 0.70, 0.70, 0.70 }
 	
-	bg[NORMAL] = { 0.40, 0.40, 0.40 }
+	bg[NORMAL] = { 0.35, 0.35, 0.40 }
 	
 	base[NORMAL] = { 0, 0, 0 }
 	base[ACTIVE] = { 0, 0, 0 }
 	base[SELECTED] = { 0, 0, 0 }
 }
 
-
 style "small_entry" = "small_text"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
-	fg[ACTIVE] = { 0.50, 1.0, 1.0 }
+	fg[NORMAL] = { 0.70, 0.70, 0.70 }
+	fg[ACTIVE] = { 0, 1.0, 0 }
+	fg[SELECTED] = { 0, 1.0, 0 }
+	text[NORMAL] = { 0.70, 0.70, 0.70 }
+	text[ACTIVE] = { 0, 1.0, 0 }
+	text[SELECTED] = { 0, 1.0, 0 }
 	bg[NORMAL] = { 0.0, 0.0, 0.0 }
+	bg[SELECTED] = { 0.0, 0.0, 0.0 }
+	bg[SELECTED] = { 0.0, 0.0, 0.0 }
 	base[NORMAL] = { 0, 0, 0 }
 	base[ACTIVE] = { 0, 0, 0 }
 	base[SELECTED] = { 0, 0, 0 }
@@ -408,10 +477,10 @@ style "red_active_small_entry" = "small_entry"
 
 style "small_bold_entry" = "small_bold_text"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
-	fg[ACTIVE] = { 0.50, 1.0, 1.0 }
+	fg[NORMAL] = { 0.70, 0.70, 0.70 }
+	fg[ACTIVE] = { 0.70, 0.70, 0.70 }
 	
-	bg[NORMAL] = { 0.40, 0.40, 0.40 }
+	bg[NORMAL] = { 0.35, 0.35, 0.40 }
 	
 	base[NORMAL] = { 0, 0, 0 }
 	base[ACTIVE] = { 0, 0, 0 }
@@ -428,9 +497,25 @@ style "small_red_on_black_entry"  = "small_bold_text"
        bg[ACTIVE] = { 0.0, 0.0, 0.0 }
 }
 
-style "big_clock_display" = "medium_entry"
+style "non_recording_big_clock_display" = "medium_entry"
 {
-	font_name = "courier bold 34"
+	font_name = "sans 60"
+
+	fg[NORMAL] = { 0.50, 1.0, 0.50 }
+	fg[ACTIVE] = { 1.0, 0, 0.0 }
+	fg[SELECTED] = { 1.0, 0, 0 }
+	fg[PRELIGHT] = { 1.0, 0, 0.0 }
+	fg[INSENSITIVE] = { 1.0, 0, 0.0 }
+	
+	base[NORMAL] = { 0.0, 0.0, 0.0 }
+	base[ACTIVE] = { 0.0, 0.0, 0.0 }
+	bg[NORMAL] = { 0.0, 0.0, 0.0 }
+	bg[ACTIVE] = { 0.7, 0.0, 0.0 }	
+}
+
+style "recording_big_clock_display" = "non_recording_big_clock_display"
+{
+	fg[NORMAL] = { 1.0, 0, 0 }
 }
 
 style "transport_clock_display"
@@ -451,7 +536,7 @@ style "transport_clock_display"
 
 style "tempo_meter_clock_display"
 {
-	font_name = "sans 8"
+	font_name = "sans 7"
 	fg[NORMAL] = { 1.0, 1.0, 1.0 }
 	fg[ACTIVE] = { 1.0, 1.0, 0.0 }
 	fg[SELECTED] = { 1.0, 0, 0 }
@@ -482,7 +567,7 @@ style "audio_track_base" = "default_base"
 {
   font_name = "sans 6"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
-  bg[NORMAL] = { 0.18, 0.18, 0.22 }
+  bg[NORMAL] = { 0.18, 0.19, 0.22 }
   bg[ACTIVE] = { 0.20, 0.20, 0.20 }	
   bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
   bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
@@ -494,7 +579,8 @@ style "audio_bus_base"
   font_name = "sans 6"
   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] = {0, 0.36, 0.40 }
+  bg[NORMAL] = "#444466"	
 }
 
 style "track_name_display"
@@ -518,7 +604,7 @@ style "active_track_name_display"
 
 style "track_separator"
 {
-	bg[NORMAL] = { 0.40, 0.40, 0.40 }
+	bg[NORMAL] = { 0.35, 0.35, 0.40 }
 }
 
 #
@@ -570,27 +656,44 @@ style "edit_group_3"
 	bg[SELECTED] = { 0.93, 0.34, 0.08 }
 }
 
-style "region_list_display" = "small_bold_text"
+style "treeview_parent_node"
 {
-	fg[NORMAL] = { 0.80, 0.80, 0.80 }
-	fg[ACTIVE] = { 0.80, 0.80, 0.80 }
-	fg[SELECTED] = { 0.50, 1.0, 1.0 }
-	bg[NORMAL] = { 0, 0, 0 }
-	bg[ACTIVE] = { 0, 0, 0 }
-	bg[SELECTED] = { 0, 0, 0 }
-	base[NORMAL] = { 0, 0, 0 }
- 	base[ACTIVE] = { 0, 1, 0 }
- 	base[INSENSITIVE] = { 0, 0, 0 }
- 	base[SELECTED] = { 0.80, 0.80, 0.80 }
+	# 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"
+{
+	# expander arrow border and DnD "icon" text
+	fg[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 }    
+
+	# selected row bg when window has focus
+ 	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 }  
+
+	# selected row text without window focus (including during DnD)
+	text[ACTIVE] = { 0, 1.0, 1.0 }  
 }
 
 style "main_canvas_area"
 {
-	bg[NORMAL] = { 0.38, 0.38, 0.38 }
-	bg[ACTIVE] = { 0.38, 0.38, 0.38 }
-	bg[INSENSITIVE] = { 0.38, 0.38, 0.38 }
-	bg[SELECTED] = { 0.38, 0.38, 0.38 }
-	bg[PRELIGHT] = { 0.38, 0.38, 0.38 }
+	bg[NORMAL] = { 0.20, 0.20, 0.25 }
+	bg[ACTIVE] = { 0.20, 0.20, 0.25 }
+	bg[INSENSITIVE] = { 0.20, 0.20, 0.25 }
+	bg[SELECTED] = { 0.20, 0.20, 0.25 }
+	bg[PRELIGHT] = { 0.20, 0.20, 0.25 }
 }
 
 style "track_controls_inactive"
@@ -633,7 +736,7 @@ style "plugin_slider"
 
 	fg[NORMAL] = { 0.37, 0.43, 0.52 }
 	fg[ACTIVE] = { 0.37, 0.43, 0.52 }
-	fg[INSENSITIVE] = {0.40, 0.40, 0.40 } # matches default_base
+	fg[INSENSITIVE] = {0.35, 0.35, 0.40 } # matches default_base
 	fg[SELECTED] = { 0.37, 0.43, 0.52 }
 	fg[PRELIGHT] = { 0.37, 0.43, 0.52 }
 
@@ -667,6 +770,16 @@ style "track_list_display" = "small_bold_text"
  	base[SELECTED] = { 0, 0, 0 }
 }
 
+style "inspector_track_list_display" = "track_list_display"
+{
+ 	text[ACTIVE] = { 0.8, 0.8, 0.8 }
+
+	base[NORMAL] = { 0, 0, 0 }
+ 	base[ACTIVE] = { 0.2, 0.2, 0.2 }
+ 	base[INSENSITIVE] = { 0, 0, 0 }
+ 	base[SELECTED] = { 0.3, 0.3, 0.4 }
+}
+
 style "redirect_list_display"
 {
 	GtkTreeView::horizontal-separator = 0
@@ -674,7 +787,7 @@ style "redirect_list_display"
 
 	font_name = "sans 7"
 	text[NORMAL] = { 0.80, 0.80, 0.80 }
- 	text[ACTIVE] = { 0.5, 0.5, 0.9 }
+ 	text[ACTIVE] = { 0.70, 0.70, 0.70 }
  	text[INSENSITIVE] = { 0, 0, 0 }
  	text[SELECTED] = { 0.9, 0.3, 0.3 }
 
@@ -687,7 +800,12 @@ style "redirect_list_display"
         # text
 
 	fg[NORMAL] = { 0.5, 0.5, 0.5 }  # used for inactive
-	fg[ACTIVE] = { 0.5, 1.0, 1.0 }  # used for active
+	fg[ACTIVE] = { 1.0, 1.0, 1.0 }  # used for active
+}
+
+style "inspector_redirect_list_display" = "redirect_list_display"
+{
+ 	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
 # MixerPanZone:
@@ -701,12 +819,6 @@ style "pan_zone" = "default_base"
 	fg[ACTIVE] = { 0.95, 0.48, 0.11 }
 }
 
-style "wall_clock" = "medium_bold_text"
-{
-	fg[NORMAL] = { 1.0, 1.0, 1.0 }
-	bg[NORMAL] = { 0, 0, 0 }
-}
-
 style "paler_red_when_active" = "medium_text"
 {
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
@@ -745,31 +857,86 @@ style "selected_strip_frame"
 style "flashing_alert" = "very_small_text"
 {
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
-	bg[NORMAL] = { 0.31, 0.31, 0.31 }
+	bg[NORMAL] = { 0.26, 0.26, 0.31 }
 
 	fg[ACTIVE] = { 0.80, 0.80, 0.80 }
 	bg[ACTIVE] = { 1.0, 0, 0}
 }
 
-style "selected_io_selector_port_list" = "medium_text"
+style "selected_io_selector_port_list" = "medium_bold_text"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
-	fg[SELECTED] = { 0.50, 1.0, 1.0 }
-	base[NORMAL] = { 0, 0, 0 }
-	base[SELECTED] = { 0, 0, 0 }
+
+	GtkTreeView::even-row-color = { 0, 0, 0 }
+	GtkTreeView::odd-row-color = { 0, 0, 0 }
+
+# fg is used to color the fg (text) of the column header button
+
+	fg[NORMAL] = { 0.85, 0.85, 0.85 }
+	fg[SELECTED] = { 0.85, 0.85, 0.85 }
+	fg[ACTIVE] = { 0.85, 0.85, 0.85 }
+	fg[PRELIGHT] = { 0.85, 0.85, 0.85 }
+	fg[INSENSITIVE] = { 0.85, 0.85, 0.85 }
+
+# bg is used used to color the background of the column header button
+
+	bg[NORMAL] = { 0.30, 0.30, 0.35 }
+	bg[ACTIVE] = { 0.30, 0.30, 0.35 }
+	bg[PRELIGHT] = { 0.30, 0.30, 0.35 }
+	bg[INSENSITIVE] = { 0.30, 0.30, 0.35 }
+	bg[SELECTED] = { 0.30, 0.30, 0.35 }
+
+# text is used to color the treeview row text
+
+	text[NORMAL] = { 0.85, 0.85, 0.85 }
+	text[SELECTED] = { 0.85, 0.85, 0.85 }
+
+# base is used to color a treeview with no rows
+
+	base[NORMAL] = { 0.20, 0.20, 0.25 }
+	base[ACTIVE] = { 0.20, 0.20, 0.25 }
+	base[PRELIGHT] = { 0.20, 0.20, 0.25 }
+	base[INSENSITIVE] = { 0.20, 0.20, 0.25 }
+	base[SELECTED] = { 0.20, 0.20, 0.25 }
+
 }
 
 style "io_selector_port_list" = "medium_text"
 {
-	fg[NORMAL] = {0.80, 0.80, 0.70 }
-	fg[SELECTED] = {0.80, 0.80, 0.70 }
-	base[NORMAL] = { 0.26, 0.26, 0.26 }
-	base[SELECTED] = { 0.26, 0.26, 0.26 }
+	GtkTreeView::even-row-color = { 0.20, 0.20, 0.25 }
+	GtkTreeView::odd-row-color = { 0.20, 0.20, 0.25 }
+# fg is used to color the fg (text) of the column header button
+
+	fg[NORMAL] = { 0.70, 0.70, 0.70 }
+	fg[SELECTED] = { 0.70, 0.70, 0.70 }
+	fg[ACTIVE] = { 0.70, 0.70, 0.70 }
+	fg[PRELIGHT] = { 0.70, 0.70, 0.70 }
+	fg[INSENSITIVE] = { 0.70, 0.70, 0.70 }
+
+# bg is used used to color the background of the column header button
+
+	bg[NORMAL] = { 0.30, 0.30, 0.35 }
+	bg[ACTIVE] = { 0.30, 0.30, 0.35 }
+	bg[PRELIGHT] = { 0.30, 0.30, 0.35 }
+	bg[INSENSITIVE] = { 0.30, 0.30, 0.35 }
+	bg[SELECTED] = { 0.30, 0.30, 0.35 }
+
+# text is used to color the treeview row text
+
+	text[NORMAL] = { 0.80, 0.80, 0.80 }
+	text[SELECTED] = { 0.80, 0.80, 0.80 }
+
+# base is used to color a treeview with no rows
+
+	base[NORMAL] = { 0.20, 0.20, 0.25 }
+	base[ACTIVE] = { 0.20, 0.20, 0.25 }
+	base[PRELIGHT] = { 0.20, 0.20, 0.25 }
+	base[INSENSITIVE] = { 0.20, 0.20, 0.25 }
+	base[SELECTED] = { 0.20, 0.20, 0.25 }
 }
 
 style "io_selector_notebook" = "default_base"
 {
-	fg[NORMAL] = { 0.50, 1.0, 1.0 }
+	fg[NORMAL] = { 1.0, 1.0, 1.0 }
         font_name ="sans bold 8"
 }
 
@@ -801,36 +968,45 @@ style "pan_slider"
 {
  	font_name = "sans 8"
 
-	fg[NORMAL] = { 0.67, 0.23, 0.22 }
-	fg[ACTIVE] = { 0.67, 0.23, 0.22 }
-	fg[INSENSITIVE] = {0.32, 0.39, 0.45 } # matches default_base
+	fg[NORMAL] = { 0.22, 0.73, 0.22 }
+	fg[ACTIVE] = { 0.22, 0.73, 0.22 }
+	fg[INSENSITIVE] = {0.22, 0.53, 0.22 } 
 	fg[SELECTED] = { 0.67, 0.23, 0.22 }
 	fg[PRELIGHT] = { 0.67, 0.23, 0.22 }
 
-	bg[NORMAL] = { 0, 0, 0 }
+	bg[NORMAL] = { 0.05, 0.05, 0.05 }
 	bg[ACTIVE] = { 0, 0, 0 }
-	bg[INSENSITIVE] = {0.32, 0.39, 0.45 } # matches default_base
+	bg[INSENSITIVE] = {0.12, 0.19, 0.25 } 
 	bg[SELECTED] = { 0, 0, 0 }
 	bg[PRELIGHT] = { 0, 0, 0 }
 
-	text[NORMAL] = { 0.85, 0.92, 0.98 }
-	text[ACTIVE] = { 0.85, 0.92, 0.98 }
-	text[INSENSITIVE] = { 0.85, 0.92, 0.98 }
-	text[SELECTED] = { 0.85, 0.92, 0.98 }
-	text[PRELIGHT] = { 0.85, 0.92, 0.98 }
+	text[NORMAL] = { 0.70, 0.70, 0.70 }
+	text[ACTIVE] = { 0.70, 0.70, 0.70 }
+	text[INSENSITIVE] = { 0.70, 0.70, 0.70 }
+	text[SELECTED] = { 0.70, 0.70, 0.70 }
+	text[PRELIGHT] = { 0.70, 0.70, 0.70 }
+
+	# used to draw the triangular indicators 
+
+	base[NORMAL] = { 0.80, 0.80, 0.80 }
+	base[ACTIVE] =  { 0.80, 0.80, 0.80 }
+	base[INSENSITIVE] = {0.6, 0.6, 0.6 }
+	base[SELECTED] = { 0.80, 0.80, 0.80 }
+	base[PRELIGHT] = { 0.80, 0.80, 0.80 }
+
 }
 
-style "region_list_whole_file"
+style "ardour_button" ="default_buttons_menus"
 {
-	fg[NORMAL] = { 0.4, 0.4, 0.9 }
+	xthickness = 1
+	ythickness = 1
 }
 
-
 #---------------------------------------------------------------
 widget "*FirstActionMessage" style "first_action_message"
 widget "*VerboseCanvasCursor" style "verbose_canvas_cursor"
 widget "*MarkerText" style "marker_text"
-widget "*TimeAxisViewItemName" style "time_axis_view_item_name"
+widget "*TimeAxisViewItemName*" style "time_axis_view_item_name"
 #widget "*ExportProgress" style "default_buttons_menus"
 widget "*ExportFileLabel" style "small_bold_text"
 widget "*ExportFormatLabel" style "medium_bold_text"
@@ -838,7 +1014,7 @@ widget "*ExportHeader" style "small_bold_text"
 widget "*ExportFileDisplay" style "medium_entry"
 widget "*ExportFormatDisplay" style "medium_entry"
 widget "*ExportCheckbox" style "small_entry"
-widget "*ExportTrackSelector" style "medium_entry_noselection_bg"
+widget "*ExportTrackSelector*" style "medium_entry_noselection_bg"
 widget "*EditModeSelector" style "medium_bold_entry"
 widget "*SnapTypeSelector" style "medium_bold_entry"
 widget "*SnapModeSelector" style "medium_bold_entry"
@@ -893,12 +1069,13 @@ widget "*TrackRecordEnableButton" style "track_rec_enable_button"
 widget "*TrackRecordEnableButton*" style "track_rec_enable_button"
 widget "*TrackMuteButton*" style "mute_button"
 widget "*TrackLoopButton*" style "track_loop_button"
+widget "*PanAutomationLineSelector*" style "multiline_combo"
 widget "*EditorTimeButton*" style "time_button"
 widget "*EditorMixerButton*" style "default_buttons_menus"
 widget "*SoloButton*" style "solo_button"
 widget "*SoloButton.*" style "solo_button"
-widget "*SafeSoloButton*" style "solo_button"
-widget "*SafeSoloButton.*" style "solo_button"
+widget "*SafeSoloButton*" style "safe_solo_button"
+widget "*SafeSoloButton.*" style "safe_solo_button"
 widget "*MixerPhaseInvertButton*" style "very_small_button"
 widget "*MixerPhaseInvertButton.*" style "very_small_button"
 widget "*MixerAutomationRecordingButton*" style "very_small_button"
@@ -935,11 +1112,16 @@ widget "*ErrorMessage" style "error_message"
 widget "*FatalMessage" style "fatal_message"
 widget "*InfoMessage" style "info_message"
 widget "*WarningMessage" style "warning_message"
-widget "*BigClockDisplay" style "big_clock_display"
+widget "*BigClockNonRecording" style "non_recording_big_clock_display"
+widget "*BigClockRecording" style "recording_big_clock_display"
 widget "*TransportClockDisplay" style "transport_clock_display"
 widget "*SecondaryClockDisplay" style "transport_clock_display"
-widget "*BBTTempoLabel" style "tempo_meter_clock_display"
-widget "*BBTMeterLabel" style "tempo_meter_clock_display"
+widget "*AudioClockFramesUpperInfo" style "tempo_meter_clock_display"
+widget "*AudioClockFramesLowerInfo" style "tempo_meter_clock_display"
+widget "*AudioClockSMPTEUpperInfo" style "tempo_meter_clock_display"
+widget "*AudioClockSMPTELowerInfo" style "tempo_meter_clock_display"
+widget "*AudioClockBBTUpperInfo" style "tempo_meter_clock_display"
+widget "*AudioClockBBTLowerInfo" style "tempo_meter_clock_display"
 widget "*SelectionStartClock" style "default_clock_display"
 widget "*SelectionEndClock" style "default_clock_display"
 widget "*EditCursorClock" style "default_clock_display"
@@ -973,10 +1155,10 @@ widget "*BaseFrame" style "base_frame"
 widget "*AudioTrackStripBase" style "audio_track_base"
 widget "*TimeAxisViewControlsBaseUnselected" style "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style "audio_track_base"
-widget "*AudioTrackFader" style "audio_track_base"
+widget "*AudioTrackFader" style "gain_fader"
 widget "*AudioBusStripBase" style "audio_bus_base"
 widget "*BusControlsBaseUnselected" style "audio_bus_base"
-widget "*AudioBusFader" style "audio_bus_base"
+widget "*AudioBusFader" style "gain_fader"
 widget "*TrackSeparator" style "track_separator"
 widget "*TrackEditIndicator0*" style "edit_group_0"
 widget "*TrackEditIndicator1*" style "edit_group_1"
@@ -990,7 +1172,6 @@ widget "*EditorTrackNameDisplay" style "track_name_display"
 widget "*EditorTrackNameDisplay*" style "track_name_display"
 widget "*EditorActiveTrackNameDisplay" style "active_track_name_display"
 widget "*EditorActiveTrackNameDisplay*" style "active_track_name_display"
-widget "*EditorRegionList" style "region_list_display"
 widget "*CrossfadeEditAuditionButton" style "red_when_active"
 widget "*CrossfadeEditAuditionButton*" style "red_when_active"
 widget "*CrossfadeEditCurveButton" style "red_when_active"
@@ -1003,6 +1184,7 @@ widget "*EditorMainCanvas" style "main_canvas_area"
 widget "*AudioTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
 widget "*BusControlsBaseInactiveUnselected" style "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
+widget "*AutomationTrackName" style "automation_track_name"
 widget "*AudioTrackControlsBaseInactiveSelected" style "track_controls_inactive"
 widget "*BusControlsBaseInactiveSelected" style "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveSelected" style "track_controls_inactive"
@@ -1024,21 +1206,19 @@ widget "*ParameterValueDisplay" style "medium_bold_entry"
 widget "*PluginUIClickBox" style "medium_bold_entry"
 widget "*PluginUIClickBox*" style "medium_bold_entry"
 widget "*PluginSlider" style "plugin_slider"
-widget "*TrackListDisplay" style "track_list_display"
-widget "*TrackListDisplay.*" style "small_bold_text"
-widget "*EditGroupList" style "track_list_display"
-widget "*RegionListDisplay" style "small_bold_entry"
-widget "*RegionListDisplay.*" style "small_bold_text"
 widget "*RedirectSelector" style "redirect_list_display"
 widget "*RedirectSelector.*" style "redirect_list_display"
+widget "*EditGroupDisplay" style "treeview_display"
+widget "*TrackListDisplay" style "treeview_display"
+widget "*RegionListDisplay" style "treeview_display"
+widget "*NamedSelectionDisplay" style "treeview_display"
+widget "*SnapshotDisplay" style "treeview_display"
 widget "*MixerTrackCommentArea" style "option_entry"
 widget "*MixerPanZone" style "pan_zone"
-widget "*MixerTrackDisplayList" style "track_list_display"
-widget "*MixerSnapshotDisplayList" style "track_list_display"
-widget "*MixerAuxDisplayList" style "track_list_display"
-widget "*MixerGroupList" style "track_list_display"
-widget "*WallClock" style "wall_clock"
-widget "*CPULoad" style "wall_clock"
+widget "*MixerTrackDisplayList" style "treeview_display"
+widget "*MixerSnapshotDisplayList" style "treeview_display"
+widget "*MixerAuxDisplayList" style "treeview_display"
+widget "*MixerGroupList" style "treeview_display"
 widget "*RegionEditorLabel" style "medium_text"
 widget "*RegionEditorSmallLabel" style "small_text"
 widget "*RegionEditorEntry" style "medium_entry"
@@ -1050,6 +1230,7 @@ widget "*MixerStripSpeedBase*" style "small_entry"
 widget "*MixerStripSpeedBaseNotOne" style "small_red_on_black_entry"
 widget "*MixerStripSpeedBaseNotOne*" style "small_red_on_black_entry"
 widget "*MixerStripGainDisplay" style "small_entry"
+widget "*MixerStripGainDisplay*" style "small_entry"
 widget "*MixerStripGainUnitButton" style "very_small_button"
 widget "*MixerStripGainUnitButton*" style "very_small_button"
 widget "*MixerStripMeterPreButton" style "very_small_button"
@@ -1072,7 +1253,9 @@ widget "*IOSelectorButton" style "default_buttons_menus"
 widget "*IOSelectorButton*" style "default_buttons_menus"
 widget "*IOSelectorList" style "medium_entry_noselection_fg"
 widget "*IOSelectorPortList" style "io_selector_port_list"
+widget "*IOSelectorPortList.*" style "io_selector_port_list"
 widget "*IOSelectorPortListSelected" style "selected_io_selector_port_list"
+widget "*IOSelectorPortListSelected.*" style "selected_io_selector_port_list"
 widget "*IOSelectorNotebook" style "io_selector_notebook"
 widget "*IOSelectorNotebookTab" style "io_selector_notebook"
 widget "*IOSelectorFrame" style "base_frame"
@@ -1085,9 +1268,9 @@ widget "*ConnectionEditorPortListSelected" style "selected_io_selector_port_list
 widget "*ConnectionEditorNotebook" style "io_selector_notebook"
 widget "*ConnectionEditorNotebookTab" style "io_selector_notebook"
 widget "*ConnectionEditorFrame" style "base_frame"
-widget "*RouteParamsListDisplay" style "track_list_display"
-widget "*RouteParamsPreListDisplay" style "track_list_display"
-widget "*RouteParamsPostListDisplay" style "track_list_display"
+widget "*RouteParamsListDisplay" style "inspector_track_list_display"
+widget "*RouteParamsPreListDisplay" style "inspector_redirect_list_display"
+widget "*RouteParamsPostListDisplay" style "inspector_redirect_list_display"
 widget "*TearOffArrow" style "tearoff_arrow"
 widget "*RouteParamsTitleButton" style "medium_text"
 widget "*RouteParamsTitleLabel" style "medium_text"
@@ -1162,12 +1345,12 @@ widget "*PanningLinkDirectionButton" style "very_small_button"
 widget "*PanningLinkDirectionButton.*" style "very_small_button"
 widget "*ChannelCountSelector" style "medium_bold_entry"
 widget "*ChannelCountSelector.GtkArrow" style "default_buttons_menus"
-widget "*RegionListWholeFile" style "region_list_whole_file"
+widget "*RegionListWholeFile" style "treeview_parent_node"
 
 class "GtkWidget" style "default_base"
 class "GtkScrollbar" style "ardour_adjusters"
 class "GtkLabel" style "default_buttons_menus"
-class "GtkButton" style "default_buttons_menus"
+class "GtkButton" style "ardour_button"
 class "GtkArrow" style "tearoff_arrow"
 class "GtkProgressBar" style "ardour_progressbars"