change GTK rc file system to use just a single file, which is color-neutral.

* packaging scripts need modification
* light theme file left in place to help with possible generation of alternate theme

8 files changed, 1218 insertions, 1440 deletions

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
new file mode 100644
index 0000000000..37fb122a98
--- /dev/null
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -0,0 +1,1202 @@
+style "default" = "medium_text"
+{
+  #Original values for reference
+
+  GtkTreeView::vertical-padding = 0
+  GtkTreeView::horizontal-padding = 0
+  GtkTreeView::even-row-color = shade(0.25,@bases)
+  GtkTreeView::odd-row-color = lighter(lighter(@bases))
+  
+  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.
+  GtkWidget           :: focus-padding                    = 1                 # [               1 ] ( >= 0 ) Width, in pixels, between focus indicator and the widget box.
+  GtkWidget           :: interior-focus                   = 1                 # [               1 ] ( bool ) Draw the focus indicator inside widgets.
+  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, @bright_color)
+  GtkWidget           :: visited-link-color               = @bright_color
+  
+  GtkDialog           :: action-area-border               = 4                 # [               5 ] ( >= 0 ) Width of border around the button area at the bottom of the dialog.
+  GtkDialog           :: button-spacing                   = 4                 # [               6 ] ( >= 0 ) Spacing between buttons.
+  GtkDialog           :: content-area-border              = 2                 # [               2 ] ( >= 0 ) Width of border around the main dialog area.
+  GtkDialog           :: content-area-spacing             = 0                 # [               0 ] ( >= 0 ) The default spacing used between elements of the content area of the dialog.
+  
+
+  GtkButton           :: default-border = { 0, 0, 0, 0 }
+  GtkButton           :: default-outside_border = { 0, 0, 0, 0 }
+  GtkButton           :: button-relief = GTK_RELIEF_NONE
+  GtkButton           :: child-displacement-x             = 1                 # [               0 ]          How far in x direction to move the button when its depressed.
+  GtkButton           :: child-displacement-y             = 1                 # [               0 ]          ... y
+  GtkButton           :: default-border                   = { 0, 0, 0, 0 }    #                              Extra space to add for CAN_DEFAULT buttons.
+  GtkButton           :: displace-focus                   = 0                 # [               0 ] ( bool ) Whether the child_displacement_x/child_displacement_y properties should also affect the focus rectangle.
+  GtkButton           :: image-spacing                    = 2                 # [               2 ] ( >= 0 ) Spacing in pixels between the image and label.
+
+  GtkCheckButton      :: indicator-size                   = 13                # [              13 ] ( >= 0 ) Size of check or radio indicator.
+  GtkCheckButton      :: indicator-spacing                = 2                 # [               2 ] ( >= 0 ) Spacing around check or radio indicator.
+  GtkCheckMenuItem    :: indicator-size                   = 13                # [              13 ] ( >= 0 ) Size of check or radio indicator.
+
+  GtkOptionMenu       :: indicator-size                   = { 6, 10 }         #                              Size of dropdown indicator.
+  GtkOptionMenu       :: indicator-spacing                = {	6, 5, 0, 0 }    #                              Spacing around indicator.
+
+  GtkComboBox         :: appears-as-list                  = 0                 # [               0 ] ( bool ) Whether dropdowns should look like lists rather than menus.
+  GtkComboBox         :: arrow-size                       = 13                # [              15 ] ( >= 0 ) Sets the minimum size of the arrow in the combo box.
+  GtkComboBox         :: shadow-type                      = GTK_SHADOW_NONE   # [ GTK_SHADOW_NONE ]          Which kind of shadow to draw around the combo box.
+
+  GtkPaned            :: handle-size                      = 4                 # [               5 ] ( >= 0 ) Width of handle.
+
+  GtkScale            :: activate-slider                  = 1                 # [               0 ] ( bool ) With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged.
+  GtkScale            :: slider-length                    = 23                # [              31 ] ( >= 0 ) Length of scale's slider.	
+  GtkScale            :: slider-width                     = 14                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.
+  GtkScale            :: trough-side-details              = 1                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.
+
+  GtkScrollbar        :: activate-slider                  = 1                 # [               0 ] ( bool ) With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged.
+  GtkScrollbar        :: arrow-scaling                    = 0.4               # [             0.5 ] ( 0.1  ) The arrow size proportion relative to the scroll button size.
+  GtkScrollbar        :: fixed-slider-length              = 0                 # [               0 ] ( bool ) Don't change slider size, just lock it to the minimum length.
+  GtkScrollbar        :: min-slider-length                = 50                # [              21 ] ( >= 0 ) Minimum length of scrollbar slider.
+  GtkScrollbar        :: slider-width                     = 15                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.    
+  GtkScrollbar        :: stepper-spacing                  = 0                 # [               0 ] ( >= 0 ) The spacing between the stepper buttons and thumb. Note that setting this value to anything > 0 will automatically set the trough-under-steppers style property to TRUE as well. Also, stepper-spacing won't have any effect if there are no steppers.
+  GtkScrollbar        :: trough-border                    = 0                 # [               1 ] ( >= 0 ) Spacing between thumb/steppers and outer trough bevel.
+  GtkScrollbar        :: trough-side-details              = 0                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.    
+  GtkScrollbar        :: trough-under-steppers            = 1                 # [               1 ] ( bool ) Whether to draw the trough across the full length of the range or to exclude the steppers and their spacing. Note that setting the "stepper-spacing" style property to any value > 0 will automatically enable trough-under-steppers too.
+
+  GtkScrollbar        :: has-backward-stepper             = 1                 # [               1 ] ( bool ) Display the standard backward arrow button.
+  GtkScrollbar        :: has-forward-stepper              = 1                 # [               1 ] ( bool ) Display the standard forward arrow button.
+  GtkScrollbar        :: has-secondary-backward-stepper   = 0                 # [               0 ] ( bool ) Display a second backward arrow button on the opposite end of the scrollbar.
+  GtkScrollbar        :: has-secondary-forward-stepper    = 0                 # [               0 ] ( bool ) Display a second forward arrow button on the opposite end of the scrollbar.
+
+  GtkHScrollbar       :: has-secondary-backward-stepper   = 0                 # [               0 ] ( bool ) Display a second backward arrow button on the opposite end of the scrollbar.
+  GtkHScrollbar       :: has-secondary-forward-stepper    = 0                 # [               0 ] ( bool ) Display a second forward arrow button on the opposite end of the scrollbar.
+  GtkVScrollbar       :: has-secondary-backward-stepper   = 0                 # [               0 ] ( bool ) Display a second backward arrow button on the opposite end of the scrollbar.
+  GtkVScrollbar       :: has-secondary-forward-stepper    = 0                 # [               0 ] ( bool ) Display a second forward arrow button on the opposite end of the scrollbar.
+
+#Menu Properties
+  GtkMenuBar          :: internal-padding                 = 1                 # [               1 ] ( >= 0 ) Amount of border space between the menubar shadow and the menu items.
+  GtkMenuBar          :: shadow-type                      = GTK_SHADOW_OUT    # [  GTK_SHADOW_OUT ]          Style of bevel around the menubar. 
+
+  GtkMenu             :: arrow-placement                  = GTK_ARROWS_BOTH   # [ GTK_ARROWS_BOTH ]          Indicates where scroll arrows should be placed.
+  GtkMenu             :: arrow-scaling                    = 0.5               # [             0.7 ] ( 0.1  ) Arbitrary constant to scale down the size of the scroll arrow.
+  GtkMenu             :: double-arrows                    = 1                 # [               1 ] ( bool ) When scrolling, always show both arrows.
+  GtkMenu             :: horizontal-offset                = -2                # [              -2 ]          When the menu is a submenu, position it this number of pixels offset horizontally.
+  GtkMenu             :: horizontal-padding               = 0                 # [               0 ] ( >= 0 ) Extra space at the left and right edges of the menu.
+  GtkMenu             :: vertical-offset                  = 0                 # [               0 ]          When the menu is a submenu, position it this number of pixels offset vertically.
+  GtkMenu             :: vertical-padding                 = 0                 # [               0 ] ( >= 0 ) Extra space at the top and bottom of the menu.
+
+  GtkMenuItem         :: arrow-scaling                    = 0.5               # [             0.8 ] ( 0.2  ) Amount of space used up by arrow, relative to the menu item's font size.
+  GtkMenuItem         :: arrow-spacing                    = 10                # [              10 ] ( >= 0 ) Space between label and arrow.
+  GtkMenuItem         :: horizontal-padding               = 3                 # [               3 ] ( >= 0 ) Padding to left and right of the menu item.
+  GtkMenuItem         :: selected-shadow-type             = GTK_SHADOW_NONE   # [ GTK_SHADOW_NONE ]          Shadow type when item is selected.
+  #GtkMenuItem         :: toggle-spacing                   = 4                 # [               5 ] ( >= 0 ) Space between icon and label.
+  GtkMenuItem         :: width-chars                      = 12                # [              12 ] ( >= 0 ) The minimum desired width of the menu item in characters.
+
+#Other Properties
+  GtkArrow            :: arrow-scaling                    = 0.5               # [             0.7 ] ( 0.1  ) Amount of space used up by arrow.
+
+  GtkNotebook         :: arrow-spacing                    = 0                 # [               0 ] ( >= 0 ) Spacing between the scroll arrows and the tabs.
+  GtkNotebook         :: tab-curvature                    = 1                 # [               1 ] ( >= 0 ) Size of tab curvature.
+  GtkNotebook         :: tab-overlap                      = 1                 # [               2 ]          Size of tab overlap area.
+
+  GtkTreeView         :: horizontal-separator             = 8                 # [               2 ] ( >= 0 ) Horizontal space between cells. Must be an even number.
+  GtkTreeView         :: vertical-separator               = 2                 # [               2 ] ( >= 0 ) Vertical space between cells. Must be an even number.
+
+  GtkEntry            :: honors-transparent-bg-hint       = 1                 # [               0 ] ( bool ) (Clearlooks) Without this, gecko will fill in the background of the entry.
+  GtkEntry            :: cursor-color = @fg_selected
+
+  #GtkToolbar::shadow_type = GTK_SHADOW_ETCHED_IN
+
+  #xthickness = 0
+  #ythickness = 0
+
+#Base Colors
+  bg[NORMAL]          = @background
+  bg[PRELIGHT]        = shade(1.1, @background)
+  bg[ACTIVE]          = shade(0.9, @background)
+  bg[INSENSITIVE]     = @background
+  bg[SELECTED]        = @bg_selected
+
+  fg[NORMAL]          = @foreground
+  fg[PRELIGHT]        = @foreground
+  fg[ACTIVE]          = shade(0.9, @foreground)
+  fg[INSENSITIVE]     = shade(0.7, @background)
+  fg[SELECTED]        = @fg_selected
+
+  base[NORMAL]        = @bases
+  base[PRELIGHT]      = @bases
+  base[INSENSITIVE]   = shade(1.0, @background)
+  base[ACTIVE]        = shade(0.9, @bg_selected)
+  base[SELECTED]      = @bg_selected
+
+  text[NORMAL]        = @texts
+  text[PRELIGHT]      = @texts
+  text[ACTIVE]        = @fg_selected
+  text[INSENSITIVE]   = shade(0.7, @lightest)
+  text[SELECTED]      = @fg_selected
+
+#engine specific tweaks
+
+  engine "clearlooks" 
+  {
+    #style              = GLOSSY
+    #colorize_scrollbar = TRUE
+    menubarstyle       = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
+    #toolbarstyle       = 0 # 0 = flat, 1 = enable effects
+  }
+}
+
+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.75, 0.75 }    
+
+	# 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] = { 1.0, 1.0, 1.0 }  
+
+	# selected row text without window focus (including during DnD)
+	text[ACTIVE] = { 1.0, 1.0, 1.0 }  
+}
+
+style "track_header_inactive"  = "larger_text"
+{     
+        bg[NORMAL] =      @track_header_inactive
+	bg[ACTIVE] =      @track_header_inactive
+	bg[INSENSITIVE] = @track_header_inactive
+	bg[SELECTED] =    @track_header_inactive
+	bg[PRELIGHT] =    @track_header_inactive
+}
+
+style "track_header_selected" = "track_header"
+{
+        bg[NORMAL] = @track_header_selected
+	bg[ACTIVE] = @track_header_selected
+	bg[INSENSITIVE] = @track_header_selected
+	bg[SELECTED] = @track_header_selected
+	bg[PRELIGHT] = @track_header_selected
+}
+
+style "automation_track_header"
+{
+	bg[NORMAL] = @automation_track_header
+	bg[ACTIVE] = @automation_track_header
+	bg[INSENSITIVE] = @automation_track_header
+	bg[SELECTED] = @automation_track_header
+	bg[PRELIGHT] = @automation_track_header
+}
+
+
+style "inspector_processor_list" = "processor_list"
+{
+ 	base[SELECTED] = { 0.3, 0.3, 0.3 }
+}
+
+style "time_info_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
+style "status_bar_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
+style "very_small_text"
+{
+ 	font_name = "@FONT_SMALLER@"
+}
+
+style "small_text"
+{
+ 	font_name = "@FONT_SMALL@"
+}
+
+style "small_mono_text"
+{
+	font_name = "@MONOSPACE@ @FONT_SMALLER@"
+}
+
+style "small_italic_text"
+{
+	font_name = "italic @FONT_SMALL@"
+}
+
+style "small_bold_text"
+{
+ 	font_name = "bold @FONT_SMALL@"
+}
+
+style "medium_bold_text"
+{
+ 	font_name = "bold @FONT_NORMAL@"
+}
+
+style "medium_text"
+{
+ 	font_name = "@FONT_NORMAL@"
+}
+
+style "medium_monospace_text"
+{
+        font_name = "@MONOSPACE@ @FONT_SIZE_NORMAL@"
+}
+
+style "red_medium_text" = "medium_text"
+{	
+	fg[NORMAL] = @bright_indicator
+	fg[ACTIVE] = @bright_indicator
+	fg[SELECTED] = @bright_indicator
+}
+
+style "large_bold_text"
+{
+ 	font_name = "bold @FONT_LARGE@"
+}
+
+style "big_text"
+{
+        font_name = "@FONT_BIG@"
+}
+
+style "bigger_mono_text"
+{
+	font_name = "@MONOSPACE@ @FONT_BIGGER@"
+}
+
+style "larger_text"
+{
+ 	font_name = "@FONT_LARGE@"
+}
+
+style "monospace massive_text"
+{
+	font_name = "@MONOSPACE@ bold @FONT_MASSIVE@"
+}
+
+style "big_bold_text"
+{
+	font_name = "bold @FONT_LARGER@"
+}
+
+style "plugin_name_text" = "big_bold_text"
+{
+	fg[NORMAL] = @texts
+}
+
+style "plugin_maker_text" = "large_bold_text"
+{
+	fg[NORMAL] = @texts
+}
+
+style "verbose_canvas_cursor" = "big_bold_text"
+{
+}
+
+style "marker_text" = "small text"
+{
+}
+
+style "midi_tracer_textview" = "medium_monospace_text"
+{
+	
+}
+
+style "time_axis_view_item_name" = "very small text"
+{
+}
+
+
+style "midi_tracer_textview" = "medium_monospace_text"
+{
+	
+}
+
+style "time_axis_view_item_name" = "very small text"
+{
+}
+style "contrasting_popup" = "medium_monospace_text"
+{
+	bg[NORMAL]          = @lightest
+	fg[NORMAL]          = @darkest
+	base[NORMAL]        = @lightest
+	text[NORMAL]        = @darkest
+	text[ACTIVE]        = @darkest
+	text[SELECTED]      = @darkest
+}
+
+style "base_frame"
+{
+	fg[NORMAL] = @background
+	bg[NORMAL] = @background
+}
+
+style "transport_base" = "medium_bold_text"
+{
+}
+
+style "default_button" = "small_text"
+{
+}
+
+style "gain_fader"
+{
+	bg[NORMAL] = shade (0.7, @background)
+	bg[ACTIVE] = shade (0.705, @background)
+	bg[INSENSITIVE] = shade (0.705, @background)
+
+	fg[INSENSITIVE] = shade(1.4, @background)
+	fg[NORMAL] = shade(1.4, @background)
+	fg[ACTIVE] = shade(1.4, @background)
+}
+
+style "default_menu" = "medium_text"
+{
+}
+
+style "default_generic" = "medium_text"
+{
+}
+
+style "text_cell_entry" = "medium_text"
+{
+}
+
+style "very_small_button" = "default_button"
+{
+	ythickness = 0
+	xthickness = 0
+}
+
+style "small_button" = "default_button"
+{
+}
+
+style "very_small_red_active_and_selected_button" = "very_small_button"
+{
+	fg[ACTIVE] = @darkest
+	bg[ACTIVE] = @bright_indicator
+	bg[SELECTED] = @bright_indicator
+}
+
+style "small_red_active_and_selected_button" = "small_button"
+{
+	fg[ACTIVE] = @darkest
+	bg[ACTIVE] = @bright_indicator
+	bg[SELECTED] = @bright_indicator
+}
+
+style "meterbridge_label" = "small_text"
+{
+}
+
+style "midi_device" = "very_small_text"
+{
+}
+
+style "solo_isolate" = "very_small_text"
+{
+}
+
+style "solo_safe" = "very_small_text"
+{
+}
+
+style "tracknumber_label" = "medium_monospace_text"
+{
+}
+
+style "solo_button" = "small_button"
+{
+}
+
+style "mute_button" = "small_button"
+{
+}
+
+style "processor" = "small_text"
+{
+}
+
+style "ruler_label" = "small_bold_text"
+{
+	fg[NORMAL] = @light_text_on_dark
+}
+
+style "midi_channel_selector_button"
+{
+	bg[NORMAL] = @background
+	bg[ACTIVE] = @midi_channel_selector
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = @light_text_on_dark
+}
+
+style "shuttle_control" = "very_small_text"
+{
+	fg[NORMAL] = @control_text2
+	fg[ACTIVE] = @control_text2
+	fg[PRELIGHT] = @control_text2
+	fg[SELECTED] = @control_text2
+	fg[INSENSITIVE] = @control_text2
+
+	bg[NORMAL] = @darkest
+	bg[PRELIGHT] = @darkest
+	bg[INSENSITIVE] = @darkest
+	bg[ACTIVE] = @bright_color
+	bg[SELECTED] = @bright_color
+}
+
+style "ardour_adjusters" = "default_generic"
+{
+	bg[NORMAL] = @background
+	bg[PRELIGHT] = lighter(@background)
+	bg[ACTIVE] = @darkest
+}
+
+style "editor_hscrollbar" = "ardour_adjusters"
+{
+	#
+	# special case: we want this scrollbar to be as tall as the
+	# zoom focus selector combobox. scrollbars don't expand to
+	# fill the space available to them, so we have to explicitly
+	# make it bigger.
+	#
+	GtkRange::slider_width = 27
+	GtkScrollbar::slider_width = 27
+}
+
+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] = @bright_color
+}
+
+style "preferences"  = "default"
+{
+	fg[PRELIGHT] = lighter(@foreground)
+}
+
+style "option_entry"  = "default"
+{
+
+}
+
+style "very_small_bright_when_active" = "very_small_text"
+{
+	fg[NORMAL] = @foreground
+	bg[NORMAL] = @background
+	bg[PRELIGHT] = @background
+
+	fg[ACTIVE] = @foreground
+	bg[ACTIVE] = @bright_indicator
+	bg[PRELIGHT] = @bright_indicator
+}
+
+style "bright_when_active" = "medium_text"
+{
+	fg[NORMAL] = @foreground
+	bg[NORMAL] = @background
+	bg[PRELIGHT] = @background
+
+	fg[ACTIVE] = @foreground
+	bg[ACTIVE] = @bright_indicator
+	bg[PRELIGHT] = @bright_indicator
+}
+
+style "xrun_warn"  = "larger_bold_text"
+{
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = @foreground
+	text[NORMAL] = @foreground
+	text[ACTIVE] = @foreground
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	bg[NORMAL] = @bright_indicator
+	bg[ACTIVE] = @contrasting_indicator
+}
+
+style "fatal_message" = "medium_text"
+{
+	fg[ACTIVE] = @bright_indicator
+	fg[NORMAL] = @bright_indicator
+	bg[ACTIVE]   = @bases
+	bg[NORMAL]   = @bases
+	base[NORMAL] = @bases
+	base[NORMAL] = @bases
+}
+
+style "error_message" = "medium_text"
+{
+	fg[ACTIVE] = @bright_indicator
+	fg[NORMAL] = @bright_indicator
+	bg[ACTIVE]   = @bases
+	bg[NORMAL]   = @bases
+	base[NORMAL] = @bases
+	base[NORMAL] = @bases
+}
+
+style "info_message" = "medium_text"
+{
+	fg[ACTIVE]   = @contrasting_indicator
+	fg[NORMAL]   = @contrasting_indicator
+	bg[ACTIVE]   = @bases
+	bg[NORMAL]   = @bases
+	base[NORMAL] = @bases
+	base[NORMAL] = @bases
+}
+
+style "warning_message" = "medium_text"
+{
+	fg[ACTIVE] = @bright_color
+	fg[NORMAL] = @bright_color
+	bg[ACTIVE]   = @bases
+	bg[NORMAL]   = @bases
+	base[NORMAL] = @bases
+	base[NORMAL] = @bases
+}
+
+style "medium_entry" = "medium_text"
+{
+	fg[NORMAL] = @texts
+	fg[ACTIVE] = @contrasting_indicator
+	fg[SELECTED] = @fg_selected
+
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[SELECTED] = @fg_selected
+
+	bg[NORMAL] = @bases
+	bg[SELECTED] = @bases
+	bg[SELECTED] = @bg_selected
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	base[SELECTED] = @bg_selected
+}
+
+style "medium_entry_noselection_fg" = "medium_entry"
+{
+	# this seems wrong to me, but the light theme uses it
+	fg[SELECTED] = @contrasting_indicator
+}
+
+style "medium_entry_noselection_bg" = "medium_entry"
+{
+	# this seems wrong to me, but the light theme uses it
+	bg[SELECTED] = @texts
+}
+
+style "medium_bold_entry"  = "medium_bold_text"
+{
+	fg[NORMAL] = @texts
+	fg[ACTIVE] = @contrasting_indicator
+	fg[SELECTED] = @fg_selected
+	
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[SELECTED] = @fg_selected
+
+	bg[NORMAL] = @bases
+	bg[SELECTED] = @bases
+	bg[SELECTED] = @bases
+	
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	base[SELECTED] = @bg_selected
+}
+
+style "small_entry" = "small_text"
+{
+	xthickness = 3
+	ythickness = 3
+	fg[NORMAL] = @texts
+	fg[ACTIVE] = @contrasting_indicator
+	fg[SELECTED] = @fg_selected
+
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[SELECTED] = @fg_selected
+
+	bg[NORMAL] = @bases
+	bg[ACTIVE] = @bases
+	bg[SELECTED] = @bases
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	base[SELECTED] = @bases
+}
+
+style "small_spinner" = "small_text"
+{
+	xthickness = 0
+	ythickness = 0
+	fg[NORMAL] = @texts
+	fg[ACTIVE] = @contrasting_indicator
+	fg[SELECTED] = @fg_selected
+
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[SELECTED] = @fg_selected
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	base[SELECTED] = @background
+}
+
+style "red_active_small_entry" = "small_entry"
+{
+	fg[ACTIVE] = @texts
+	fg[SELECTED] = @texts
+	text[SELECTED] = @texts
+}
+
+style "small_red_on_black_entry"  = "small_bold_text"
+{
+	fg[NORMAL] = @bright_indicator
+	fg[ACTIVE] = @bright_indicator
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	bg[NORMAL] = @bases
+	bg[ACTIVE] = @bases
+}
+
+style "audio_bus_base" = "very_small_text"
+{
+	fg[NORMAL] = @foreground
+	bg[NORMAL] = @audio_bus
+	bg[ACTIVE] = @background
+}
+
+style "send_strip_base" = "default"
+{
+	font_name = " 8"
+	# NORMAL is used for single-data type labels, or Audio
+	# ACTIVE is used for MIDI in the presence of multiple data type
+	fg[NORMAL] = @send_fg
+	fg[ACTIVE] = darker(@foreground)
+
+	bg[NORMAL] = @send_bg
+	bg[ACTIVE] = @send_bg
+	bg[PRELIGHT] = @send_bg
+	bg[INSENSITIVE] = @send_bg
+	bg[SELECTED] = @send_bg
+}
+
+style "audio_track_base" = "default"
+{
+	font_name = " 8"
+	# NORMAL is used for single-data type labels, or Audio
+	# ACTIVE is used for MIDI in the presence of multiple data type
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = darker(@foreground)
+
+	bg[NORMAL] = @audio_track
+	bg[ACTIVE] = @background
+	bg[PRELIGHT] = @background
+	bg[INSENSITIVE] = @background
+	bg[SELECTED] = @background
+}
+
+style "midi_track_base" = "default"
+{
+	font_name = " 8"
+	# NORMAL is used for single-data type labels, or Audio
+	# ACTIVE is used for MIDI in the presence of multiple data type
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = darker(@foreground)
+
+	bg[NORMAL] = @midi_track
+	bg[ACTIVE] = @background
+	bg[PRELIGHT] = @background
+	bg[INSENSITIVE] = @background
+	bg[SELECTED] = @background
+}
+
+style "audio_track_fader" = "gain_fader"
+{
+	bg[PRELIGHT] = @audio_track
+}
+style "audio_bus_fader" = "gain_fader"
+{
+	bg[PRELIGHT] = @audio_bus
+}
+style "midi_track_fader" = "gain_fader"
+{
+	bg[PRELIGHT] = @midi_track
+}
+
+style "audio_track_metrics" = "audio_track_base"
+{
+	font_name = ""
+}
+
+style "midi_track_metrics" = "midi_track_base"
+{
+	font_name = ""
+}
+
+style "audiomidi_track_metrics" = "midi_track_base"
+{
+	font_name = ""
+}
+
+style "audio_bus_metrics" = "audio_bus_base"
+{
+	font_name = ""
+}
+
+style "audio_track_metrics_inactive" = "track_controls_inactive"
+{
+	font_name = ""
+}
+
+style "midi_track_metrics_inactive" = "track_controls_inactive"
+{
+	font_name = ""
+}
+
+style "audiomidi_track_metrics_inactive" = "track_controls_inactive"
+{
+	font_name = ""
+}
+
+style "audio_bus_metrics_inactive" = "track_controls_inactive"
+{
+	font_name = ""
+}
+
+style "track_name_display" = "medium_text"
+{
+	xthickness = 0
+	ythickness = 0
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = @foreground
+	fg[SELECTED] = @foreground
+
+	text[NORMAL] = @foreground
+	text[ACTIVE] = @foreground
+	text[SELECTED] = @foreground
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = lighter(@bases)
+	base[SELECTED] = @bg_selected
+
+	bg[NORMAL] = lighter(@bases)
+	bg[ACTIVE] = lighter(@bases)
+	bg[SELECTED] = lighter(@bases)
+}
+
+style "track_separator"
+{
+	bg[NORMAL] = lighter(@background)
+}
+
+# Plugin Editors
+style "plugin_slider"
+{
+	#font_name ="bold  14"
+
+	# the slider itself. the inactive part is INSENSITIVE,
+	# the active part is taken from some other state.
+
+	fg[NORMAL] = @bright_color
+	fg[ACTIVE] = @bright_color
+	fg[INSENSITIVE] = @lightest # matches default
+	fg[SELECTED] = @bright_color
+	fg[PRELIGHT] = @bright_color
+
+	# draws the outer rectangle around the slider
+
+	bg[NORMAL] = shade (0.6, @lightest)
+	bg[ACTIVE] = shade (0.6, @lightest)
+	bg[INSENSITIVE] = shade (0.6, @lightest)
+	bg[SELECTED] = shade (0.6, @lightest)
+
+	# outer round-corner-background (pixslider does its own hover prelight)
+	bg[PRELIGHT] = @background
+
+	# the numeric display
+
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[INSENSITIVE] = @texts
+	text[SELECTED] = @texts
+	text[PRELIGHT] = @texts
+}
+
+style "processor_control_button"  = "very_small_text"
+{
+}
+
+style "processor_control_slider"  = "plugin_slider"
+{
+	bg[PRELIGHT] = @background
+	bg[NORMAL] = @darkest
+}
+
+style "track_list_display" = "small_bold_text"
+{
+	text[NORMAL] = @texts
+	text[ACTIVE] = darker(@texts)
+	text[INSENSITIVE] = @bases
+	text[SELECTED] = @fg_selected
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = lighter(@bases)
+	base[INSENSITIVE] = darker(@bases)
+	base[SELECTED] = @bg_selected
+}
+
+style "inspector_track_list_display" = "track_list_display"
+{
+
+}
+
+style "processor_list" = "very_small_text"
+{
+	bg[NORMAL] = @darkest
+	bg[ACTIVE] = shade (1.8, @fg_selected)
+	fg[ACTIVE] = @darkest
+}
+
+# MixerPanZone:
+#
+# the NORMAL fg color is used for the pan puck
+# the ACTIVE fg color is used for the speaker boxes
+
+style "pan_zone" = "default"
+{
+	fg[NORMAL] = @contrasting_indicator
+	fg[ACTIVE] = darker(@bright_color)
+}
+
+style "paler_bright_when_active" = "medium_text"
+{
+	fg[NORMAL] = @foreground
+	fg[PRELIGHT] = @foreground
+	bg[NORMAL] = @background
+	bg[PRELIGHT] = @background
+
+	fg[ACTIVE] = @foreground
+	bg[ACTIVE] = lighter(@bright_indicator)
+}
+
+style "peak_display_peaked_entry" = "small_entry"
+{
+	fg[ACTIVE] = @texts
+	fg[SELECTED] = @texts
+	text[SELECTED] = @texts
+
+	base[NORMAL] = @bright_indicator
+	base[ACTIVE] = @bright_indicator
+	base[PRELIGHT] = @bright_indicator
+	base[INSENSITIVE] = @bright_indicator
+	base[SELECTED] = @bright_indicator
+}
+
+style "selected_strip_frame"
+{
+	fg[NORMAL] = @bright_indicator
+	bg[NORMAL] = darker(@bright_indicator)
+}
+
+style "flashing_alert" = "very_small_text"
+{
+	GtkButton::child-displacement-x = 0
+	GtkButton::child-displacement-y = 0
+
+	fg[NORMAL] = darker(@foreground)
+	fg[PRELIGHT] = darker(@foreground)
+	bg[NORMAL] = mix(0.1,@bright_indicator,darker(@background))
+	bg[PRELIGHT] = mix(0.1,@bright_indicator,darker(@background))
+
+	fg[ACTIVE] = @foreground
+	bg[ACTIVE] = @bright_indicator
+}
+
+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] = @somewhat_bright_indicator
+	bg[PRELIGHT] = @somewhat_bright_indicator
+	bg[SELECTED] = @somewhat_bright_indicator
+	bg[NORMAL] = @somewhat_bright_indicator
+	
+	fg[NORMAL] = @darkest
+	fg[PRELIGHT] = @darkest
+	fg[SELECTED] = @darkest
+	fg[ACTIVE] = @darkest
+}
+
+style "tearoff_arrow" = "medium_bold_entry"
+{
+	fg[NORMAL] = darker(@foreground)
+	fg[PRELIGHT] = darker(@foreground)
+	bg[NORMAL] = darker(@foreground)
+	bg[PRELIGHT] = darker(@foreground)
+}
+
+style "location_row_button" = "default_button"
+{
+	font_name = " 10"
+}
+
+
+style "ardour_button" ="default_button"
+{
+	xthickness = 1
+	ythickness = 1
+}
+
+style "padded_button" = "default_button"
+{
+	xthickness = 8
+}
+
+style "tooltip" = "medium_text"
+{
+	fg[NORMAL] = @fg_tooltip
+	bg[NORMAL] = @bg_tooltip
+}
+
+style "default_toggle_button"
+{
+	bg[NORMAL] = @background
+	bg[PRELIGHT] = shade(1.1, @background)
+	bg[ACTIVE] = @contrasting_indicator
+}
+
+style "default_toggle_button_active" = "default_toggle_button"
+{
+	bg[NORMAL] = @contrasting_indicator
+	bg[ACTIVE] = @contrasting_indicator
+	bg[SELECTED] = @contrasting_indicator
+	bg[PRELIGHT] = shade(1.2, @contrasting_indicator)
+}
+
+#style "meter_strip_dpm" = "default"
+#{
+#}
+
+style "black_separator" = "default"
+{
+	bg[NORMAL] = @darkest
+}
+
+style "settings_notebook" = "big_text"
+{
+
+}
+class "GtkWidget" style:highest "default"
+class "GtkScrollbar" style:highest "ardour_adjusters"
+class "GtkLabel" style:highest "default_generic"
+class "GtkButton" style:highest "ardour_button"
+class "GtkCheckButton" style:highest "ardour_button"
+class "GtkArrow" style:highest "tearoff_arrow"
+class "GtkProgressBar" style:highest "ardour_progressbars"
+
+
+widget "*PaddedButton" style:highest "padded_button"
+widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
+widget "*MarkerText" style:highest "marker_text"
+widget "*ArdourContextMenu*" style:highest "default_menu"
+
+widget "*mixer strip button" style:highest "very_small_button"
+
+widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
+widget "*OptionsNotebook" style:highest "preferences"
+widget "*OptionsLabel" style:highest "preferences"
+widget "*OptionsEntry" style:highest "option_entry"
+widget "*InspectorNotebook" style:highest "preferences"
+widget "*EditorRulerLabel*" style:highest "ruler_label"
+widget "*MixerAutomationModeButton*" style:highest "very_small_button"
+widget "*MixerAutomationModeButton.*" style:highest "very_small_button"
+widget "*MixerAutomationPlaybackButton*" style:highest "very_small_button"
+widget "*MixerAutomationPlaybackButton.*" style:highest "very_small_button"
+widget "*ShuttleControl" style:highest "shuttle_control"
+#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"
+widget "*WarningMessage" style:highest "warning_message"
+
+widget "*big clock" style:highest "monospace massive_text"
+widget "*selection clock" style:highest "small_mono_text"
+widget "*punch clock" style:highest "small_mono_text"
+widget "*transport clock" style:highest "bigger_mono_text"
+widget "*secondary clock" style:highest "bigger_mono_text"
+widget "*transport delta clock" style:highest "bigger_mono_text"
+widget "*secondary delta clock" style:highest "bigger_mono_text"
+widget "*silence duration clock" style:highest "medium_text"
+widget "*edit point clock" style:highest "medium_text"
+widget "*nudge clock" style:highest "small_mono_text"
+widget "*menubar clock" style:highest "medium_text"
+widget "*zoomrange clock" style:highest "medium_text"
+widget "*timecodeoffset clock" style:highest "medium_text"
+
+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"
+widget "*AudioTrackStripBaseInactive" style:highest "track_header_inactive"
+widget "*AudioBusStripBaseInactive" style:highest "track_header_inactive"
+widget "*MidiTrackStripBaseInactive" style:highest "track_header_inactive"
+widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
+widget "*MidiTrackMetrics" style:highest "midi_track_metrics"
+widget "*AudioBusMetrics" style:highest "audio_bus_metrics"
+widget "*AudioMidiTrackMetrics" style:highest "midi_track_metrics"
+widget "*AudioTrackMetricsLeft" style:highest "audio_track_metrics"
+widget "*MidiTrackMetricsLeft" style:highest "midi_track_metrics"
+widget "*AudioBusMetricsLeft" style:highest "audio_bus_metrics"
+widget "*AudioMidiTrackMetricsLeft" style:highest "midi_track_metrics"
+widget "*AudioTrackMetricsRight" style:highest "audio_track_metrics"
+widget "*MidiTrackMetricsRight" style:highest "midi_track_metrics"
+widget "*AudioBusMetricsRight" style:highest "audio_bus_metrics"
+widget "*AudioMidiTrackMetricsRight" style:highest "midi_track_metrics"
+widget "*AudioTrackMetricsInactive" style:highest "audio_track_metrics_inactive"
+widget "*MidiTrackMetricsInactive" style:highest "midi_track_metrics_inactive"
+widget "*AudioBusMetricsInactive" style:highest "audio_bus_metrics_inactive"
+widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inactive"
+
+widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
+widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
+widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
+
+widget "*SendUIFader" style:highest "plugin_slider"
+widget "*ReturnUIFader" style:highest "plugin_slider"
+
+widget "*AudioTrackFader" style:highest "audio_track_fader"
+widget "*MidiTrackFader" style:highest "midi_track_fader"
+widget "*AudioBusFader" style:highest "audio_bus_fader"
+
+widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
+widget "*TrackSeparator" style:highest "track_separator"
+widget "*EditorTrackNameDisplay" style:highest "track_name_display"
+widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
+widget "*CrossfadeEditAuditionButton" style:highest "bright_when_active"
+widget "*CrossfadeEditAuditionButton*" style:highest "bright_when_active"
+widget "*CrossfadeEditCurveButton" style:highest "bright_when_active"
+widget "*CrossfadeEditCurveButton*" style:highest "bright_when_active"
+widget "*CrossfadeEditFrame" style:highest "base_frame"
+widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_header_inactive"
+widget "*BusControlsBaseInactiveUnselected" style:highest "track_header_inactive"
+widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_header_inactive"
+widget "*BusControlsBaseInactiveSelected" style:highest "track_header_inactive"
+widget "*AudioTrackControlsBaseSelected" style:highest "track_header_selected"
+widget "*MidiTrackControlsBaseSelected" style:highest "track_header_selected"
+widget "*BusControlsBaseSelected" style:highest "track_header_selected"
+widget "*AutomationTrackControlsBase" style:highest "automation_track_header"
+widget "*AutomationTrackControlsBaseSelected" style:highest "track_header_selected"
+widget "*PluginParameterLabel" style:highest "medium_text"
+widget "*MotionControllerValue" style:highest "small_entry"
+widget "*MotionControllerValue*" style:highest "small_entry"
+widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
+widget "*PluginUIClickBox" style:highest "medium_bold_entry"
+widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
+widget "*ProcessorControlSlider" style:highest "processor_control_slider"
+widget "*processor control button" style:highest "processor_control_button"
+widget "*PluginSlider" style:highest "plugin_slider"
+widget "*GainFader" style:highest "plugin_slider"
+widget "*MixerTrackCommentArea" style:highest "option_entry"
+widget "*MixerPanZone" style:highest "pan_zone"
+widget "*RegionEditorLabel" style:highest "medium_text"
+widget "*RegionEditorEntry" style:highest "medium_entry"
+widget "*MixerStripGainDisplay" style:highest "small_entry"
+widget "*MixerStripGainDisplay*" style:highest "small_entry"
+widget "*MixerStripPeakDisplay" style:highest "red_active_small_entry"
+widget "*MixerStripPeakDisplay*" style:highest "red_active_small_entry"
+widget "*MixerStripPeakDisplayPeak*" style:highest "peak_display_peaked_entry"
+widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame"
+widget "*MixerStripFrame" style:highest "base_frame"
+widget "*FadeCurve" style:highest "medium_bold_entry"
+widget "*FadeCurve*" style:highest "medium_bold_entry"
+widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
+widget "*TearOffArrow" style:highest "tearoff_arrow"
+widget "*RouteParamsTitleLabel" style:highest "medium_text"
+widget "*PluginAutomateButton" style:highest "small_button"
+widget "*PluginAutomateButton*" style:highest "small_button"
+widget "*PluginSaveButton" style:highest "small_button"
+widget "*PluginSaveButton*" style:highest "small_button"
+widget "*PluginEditorButton*" style:highest "default_toggle_button"
+widget "*PluginEditorButton-active" style:highest "default_toggle_button_active"
+
+widget "*BarControlSpinner" style:highest "small_spinner"
+widget "*BarControlSpinner*" style:highest "small_spinner"
+
+widget "*BlackSeparator" style:highest "black_separator"
+
+widget "*MetricLabel" style:highest "medium_text"
+widget "*ChoiceWindow" style:highest "default_generic"
+widget "*TrackLabel" style:highest "medium_text"
+widget "*TrackParameterName" style:highest "small_italic_text"
+widget "*AddRouteDialog*" style:highest "medium_text"
+widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
+widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
+widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
+widget "*NewSessionSR1Label" style:highest "red_medium_text"
+widget "*NewSessionSR2Label" style:highest "medium_text"
+widget "*location edit row clock" style:highest "medium_text"
+widget "*LocationEditNameLabel" style:highest "medium_text"
+widget "*LocationEditCdButton" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditCdButton*" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditHideButton" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditHideButton*" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditLockButton*" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditGlueButton*" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditNumberLabel" style:highest "small_text"
+widget "*LocationEditNameEntry" style:highest "option_entry"
+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 "*ChannelCountSelector" style:highest "medium_bold_entry"
+widget "*RegionListWholeFile" style:highest "treeview_parent_node"
+widget "*ProcessorList*" style:highest "processor_list"
+widget "*PortMatrixLabel*" style:highest "small_text"
+widget "*midi device" style:highest "midi_device"
+widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
+widget "*meterbridge label" style:highest "meterbridge_label"
+widget "*ContrastingPopup" style:highest "contrasting_popup"
+widget "*ContrastingPopup*" style:highest "contrasting_popup"
+widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
+widget "*TimeInfoSelectionTitle" style:highest "very_small_text"
+widget "*TimeInfoSelectionLabel" style:highest "very_small_text"
+widget "*TimeInfoBox" style:highest "time_info_box"
+widget "*tracknumber label" style:highest "tracknumber_label"
+widget "*StatusBarBox" style:highest "status_bar_box"
+widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
+widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
+widget "*MeasureLatencyButton" style:highest "default_toggle_button"
+widget "*processor prefader" style:highest "processor"
+widget "*processor fader" style:highest "processor"
+widget "*processor postfader" style:highest "processor"
+widget "*MonitorSectionLabel" style:highest "small_text"
+widget "*ooltip*" style:highest "tooltip"
diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index 1294a3d09f..139f5c0dc3 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -2,7 +2,7 @@
 <Ardour>
   <UI>
     <Option name="icon-set" value="default"/>
-    <Option name="ui-rc-file" value="ui_dark.rc"/>
+    <Option name="ui-rc-file" value="clearlooks.rc"/>
     <Option name="flat-buttons" value="0"/>
     <Option name="blink-rec-arm" value="0"/>
     <Option name="waveform-gradient-depth" value="0"/>
diff --git a/gtk2_ardour/fonts.rc.in b/gtk2_ardour/fonts.rc.in
deleted file mode 100644
index 8d09ff0f1d..0000000000
--- a/gtk2_ardour/fonts.rc.in
+++ /dev/null
@@ -1,103 +0,0 @@
-style "very_small_text"
-{
- 	font_name = "@FONT_SMALLER@"
-}
-
-style "small_text"
-{
- 	font_name = "@FONT_SMALL@"
-}
-
-style "small_mono_text"
-{
-	font_name = "@MONOSPACE@ @FONT_SMALLER@"
-}
-
-style "small_italic_text"
-{
-	font_name = "italic @FONT_SMALL@"
-}
-
-style "small_bold_text"
-{
- 	font_name = "bold @FONT_SMALL@"
-}
-
-style "medium_bold_text"
-{
- 	font_name = "bold @FONT_NORMAL@"
-}
-
-style "medium_text"
-{
- 	font_name = "@FONT_NORMAL@"
-}
-
-style "medium_monospace_text"
-{
-        font_name = "@MONOSPACE@ @FONT_SIZE_NORMAL@"
-}
-
-style "red_medium_text" = "medium_text"
-{	
-	fg[NORMAL] = @@COLPREFIX@_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
-style "large_bold_text"
-{
- 	font_name = "bold @FONT_LARGE@"
-}
-
-style "big_text"
-{
-        font_name = "@FONT_BIG@"
-}
-
-style "bigger_mono_text"
-{
-	font_name = "@MONOSPACE@ @FONT_BIGGER@"
-}
-
-style "larger_text"
-{
- 	font_name = "@FONT_LARGE@"
-}
-
-style "monospace massive_text"
-{
-	font_name = "@MONOSPACE@ bold @FONT_MASSIVE@"
-}
-
-style "big_bold_text"
-{
-	font_name = "bold @FONT_LARGER@"
-}
-
-style "plugin_name_text" = "big_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-}
-
-style "plugin_maker_text" = "large_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-}
-
-style "verbose_canvas_cursor" = "big_bold_text"
-{
-}
-
-style "marker_text" = "small text"
-{
-}
-
-style "midi_tracer_textview" = "medium_monospace_text"
-{
-	
-}
-
-style "time_axis_view_item_name" = "very small text"
-{
-}
diff --git a/gtk2_ardour/styles.rc.in b/gtk2_ardour/styles.rc.in
deleted file mode 100644
index 329fdc92ea..0000000000
--- a/gtk2_ardour/styles.rc.in
+++ /dev/null
@@ -1,689 +0,0 @@
-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] = @@COLPREFIX@_bg
-	bg[NORMAL] = @@COLPREFIX@_bg
-}
-
-style "transport_base" = "medium_bold_text"
-{
-}
-
-style "default_button" = "small_text"
-{
-}
-
-style "gain_fader"
-{
-	bg[NORMAL] = shade (0.7, @@COLPREFIX@_bg)
-	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_bg)
-	bg[INSENSITIVE] = shade (0.705, @@COLPREFIX@_bg)
-
-	fg[INSENSITIVE] = shade(1.4, @@COLPREFIX@_bg)
-	fg[NORMAL] = shade(1.4, @@COLPREFIX@_bg)
-	fg[ACTIVE] = shade(1.4, @@COLPREFIX@_bg)
-}
-
-style "default_menu" = "medium_text"
-{
-}
-
-style "default_generic" = "medium_text"
-{
-}
-
-style "text_cell_entry" = "medium_text"
-{
-}
-
-style "very_small_button" = "default_button"
-{
-	ythickness = 0
-	xthickness = 0
-}
-
-style "small_button" = "default_button"
-{
-}
-
-style "very_small_red_active_and_selected_button" = "very_small_button"
-{
-	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] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	bg[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
-style "meterbridge_label" = "small_text"
-{
-}
-
-style "midi_device" = "very_small_text"
-{
-}
-
-style "solo_isolate" = "very_small_text"
-{
-}
-
-style "solo_safe" = "very_small_text"
-{
-}
-
-style "tracknumber_label" = "medium_monospace_text"
-{
-}
-
-style "solo_button" = "small_button"
-{
-}
-
-style "mute_button" = "small_button"
-{
-}
-
-style "processor" = "small_text"
-{
-}
-
-style "ruler_label" = "small_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_light_text_on_dark
-}
-
-style "midi_channel_selector_button"
-{
-	bg[NORMAL] = @@COLPREFIX@_bg
-	bg[ACTIVE] = @@COLPREFIX@_midi_channel_selector
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_light_text_on_dark
-}
-
-style "shuttle_control" = "very_small_text"
-{
-	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] = @@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] = @@COLPREFIX@_bg
-	bg[PRELIGHT] = lighter(@@COLPREFIX@_bg)
-	bg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "editor_hscrollbar" = "ardour_adjusters"
-{
-	#
-	# special case: we want this scrollbar to be as tall as the
-	# zoom focus selector combobox. scrollbars don't expand to
-	# fill the space available to them, so we have to explicitly
-	# make it bigger.
-	#
-	GtkRange::slider_width = 27
-	GtkScrollbar::slider_width = 27
-}
-
-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] = @@COLPREFIX@_bright_color
-}
-
-style "preferences"  = "default"
-{
-	fg[PRELIGHT] = lighter(@@COLPREFIX@_fg)
-}
-
-style "option_entry"  = "default"
-{
-
-}
-
-style "very_small_bright_when_active" = "very_small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_bg
-	bg[PRELIGHT] = @@COLPREFIX@_bg
-
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
-}
-
-style "bright_when_active" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_bg
-	bg[PRELIGHT] = @@COLPREFIX@_bg
-
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
-}
-
-style "xrun_warn"  = "larger_bold_text"
-{
-	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 "fatal_message" = "medium_text"
-{
-	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] = @@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]   = @@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] = @@COLPREFIX@_bright_color
-	fg[NORMAL] = @@COLPREFIX@_bright_color
-	bg[ACTIVE]   = @@COLPREFIX@_base
-	bg[NORMAL]   = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_base
-}
-
-style "medium_entry" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_fg_selected
-
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_fg_selected
-
-	bg[NORMAL] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_bg_selected
-
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_bg_selected
-}
-
-style "medium_entry_noselection_fg" = "medium_entry"
-{
-	# this seems wrong to me, but the light theme uses it
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "medium_entry_noselection_bg" = "medium_entry"
-{
-	# this seems wrong to me, but the light theme uses it
-	bg[SELECTED] = @@COLPREFIX@_text
-}
-
-style "medium_bold_entry"  = "medium_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_fg_selected
-	
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	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@_bg_selected
-}
-
-style "small_entry" = "small_text"
-{
-	xthickness = 3
-	ythickness = 3
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_fg_selected
-
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_fg_selected
-
-	bg[NORMAL] = @@COLPREFIX@_base
-	bg[ACTIVE] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
-
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-style "small_spinner" = "small_text"
-{
-	xthickness = 0
-	ythickness = 0
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_fg_selected
-
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_fg_selected
-
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_bg
-}
-
-style "red_active_small_entry" = "small_entry"
-{
-	fg[ACTIVE] = @@COLPREFIX@_text
-	fg[SELECTED] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_text
-}
-
-style "small_red_on_black_entry"  = "small_bold_text"
-{
-	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 "audio_bus_base" = "very_small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_audio_bus
-	bg[ACTIVE] = @@COLPREFIX@_bg
-}
-
-style "send_strip_base" = "default"
-{
-	font_name = "@FONT_SMALLER@"
-	# NORMAL is used for single-data type labels, or Audio
-	# ACTIVE is used for MIDI in the presence of multiple data type
-	fg[NORMAL] = @@COLPREFIX@_send_fg
-	fg[ACTIVE] = darker(@@COLPREFIX@_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@"
-	# NORMAL is used for single-data type labels, or Audio
-	# ACTIVE is used for MIDI in the presence of multiple data type
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = darker(@@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@"
-	# NORMAL is used for single-data type labels, or Audio
-	# ACTIVE is used for MIDI in the presence of multiple data type
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = darker(@@COLPREFIX@_fg)
-
-	bg[NORMAL] = @@COLPREFIX@_midi_track
-	bg[ACTIVE] = @@COLPREFIX@_bg
-	bg[PRELIGHT] = @@COLPREFIX@_bg
-	bg[INSENSITIVE] = @@COLPREFIX@_bg
-	bg[SELECTED] = @@COLPREFIX@_bg
-}
-
-style "audio_track_fader" = "gain_fader"
-{
-	bg[PRELIGHT] = @@COLPREFIX@_audio_track
-}
-style "audio_bus_fader" = "gain_fader"
-{
-	bg[PRELIGHT] = @@COLPREFIX@_audio_bus
-}
-style "midi_track_fader" = "gain_fader"
-{
-	bg[PRELIGHT] = @@COLPREFIX@_midi_track
-}
-
-style "audio_track_metrics" = "audio_track_base"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "midi_track_metrics" = "midi_track_base"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "audiomidi_track_metrics" = "midi_track_base"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "audio_bus_metrics" = "audio_bus_base"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "audio_track_metrics_inactive" = "track_controls_inactive"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "midi_track_metrics_inactive" = "track_controls_inactive"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "audiomidi_track_metrics_inactive" = "track_controls_inactive"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "audio_bus_metrics_inactive" = "track_controls_inactive"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "track_name_display" = "medium_text"
-{
-	xthickness = 0
-	ythickness = 0
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	fg[SELECTED] = @@COLPREFIX@_fg
-
-	text[NORMAL] = @@COLPREFIX@_fg
-	text[ACTIVE] = @@COLPREFIX@_fg
-	text[SELECTED] = @@COLPREFIX@_fg
-
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = lighter(@@COLPREFIX@_base)
-	base[SELECTED] = @@COLPREFIX@_bg_selected
-
-	bg[NORMAL] = lighter(@@COLPREFIX@_base)
-	bg[ACTIVE] = lighter(@@COLPREFIX@_base)
-	bg[SELECTED] = lighter(@@COLPREFIX@_base)
-}
-
-style "track_separator"
-{
-	bg[NORMAL] = lighter(@@COLPREFIX@_bg)
-}
-
-# Plugin Editors
-style "plugin_slider"
-{
-	#font_name ="bold @FONT_BIG@"
-
-	# the slider itself. the inactive part is INSENSITIVE,
-	# the active part is taken from some other state.
-
-	fg[NORMAL] = @@COLPREFIX@_bright_color
-	fg[ACTIVE] = @@COLPREFIX@_bright_color
-	fg[INSENSITIVE] = @@COLPREFIX@_lightest # matches default
-	fg[SELECTED] = @@COLPREFIX@_bright_color
-	fg[PRELIGHT] = @@COLPREFIX@_bright_color
-
-	# draws the outer rectangle around the slider
-
-	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)
-
-	# outer round-corner-background (pixslider does its own hover prelight)
-	bg[PRELIGHT] = @@COLPREFIX@_bg
-
-	# the numeric display
-
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	text[INSENSITIVE] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_text
-	text[PRELIGHT] = @@COLPREFIX@_text
-}
-
-style "processor_control_button"  = "very_small_text"
-{
-}
-
-style "processor_control_slider"  = "plugin_slider"
-{
-	bg[PRELIGHT] = @@COLPREFIX@_bg
-	bg[NORMAL] = @@COLPREFIX@_darkest
-}
-
-style "track_list_display" = "small_bold_text"
-{
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = darker(@@COLPREFIX@_text)
-	text[INSENSITIVE] = @@COLPREFIX@_base
-	text[SELECTED] = @@COLPREFIX@_fg_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"
-{
-
-}
-
-style "processor_list" = "very_small_text"
-{
-	bg[NORMAL] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = shade (1.8, @@COLPREFIX@_fg_selected)
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-# MixerPanZone:
-#
-# the NORMAL fg color is used for the pan puck
-# the ACTIVE fg color is used for the speaker boxes
-
-style "pan_zone" = "default"
-{
-	fg[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	fg[ACTIVE] = darker(@@COLPREFIX@_bright_color)
-}
-
-style "paler_bright_when_active" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[PRELIGHT] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_bg
-	bg[PRELIGHT] = @@COLPREFIX@_bg
-
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = lighter(@@COLPREFIX@_bright_indicator)
-}
-
-style "peak_display_peaked_entry" = "small_entry"
-{
-	fg[ACTIVE] = @@COLPREFIX@_text
-	fg[SELECTED] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_text
-
-	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] = @@COLPREFIX@_bright_indicator
-	bg[NORMAL] = darker(@@COLPREFIX@_bright_indicator)
-}
-
-style "flashing_alert" = "very_small_text"
-{
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	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] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-}
-
-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] = @@COLPREFIX@_somewhat_bright_indicator
-	bg[PRELIGHT] = @@COLPREFIX@_somewhat_bright_indicator
-	bg[SELECTED] = @@COLPREFIX@_somewhat_bright_indicator
-	bg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
-	
-	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(@@COLPREFIX@_fg)
-	fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
-	bg[NORMAL] = darker(@@COLPREFIX@_fg)
-	bg[PRELIGHT] = darker(@@COLPREFIX@_fg)
-}
-
-style "location_row_button" = "default_button"
-{
-	font_name = "@FONT_NORMAL@"
-}
-
-
-style "ardour_button" ="default_button"
-{
-	xthickness = 1
-	ythickness = 1
-}
-
-style "padded_button" = "default_button"
-{
-	xthickness = 8
-}
-
-style "tooltip" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg_tooltip
-	bg[NORMAL] = @@COLPREFIX@_bg_tooltip
-}
-
-style "default_toggle_button"
-{
-	bg[NORMAL] = @@COLPREFIX@_bg
-	bg[PRELIGHT] = shade(1.1, @@COLPREFIX@_bg)
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "default_toggle_button_active" = "default_toggle_button"
-{
-	bg[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	bg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-	bg[PRELIGHT] = shade(1.2, @@COLPREFIX@_contrasting_indicator)
-}
-
-style "meter_strip_dpm" = "default"
-{
-}
-
-style "meter_strip_ppm" = "default"
-{
-	bg[NORMAL] = { 0.1, 0.1, 0.1 }
-	fg[NORMAL] = { 1.0, 1.0, 1.0 }
-}
-
-style "meter_strip_vu" = "default"
-{
-	bg[NORMAL] = { .84, .77, .58 }
-	fg[NORMAL] = { 0.0, 0.0, 0.0 }
-}
-
-style "meter_strip_sep" = "default"
-{
-	bg[NORMAL] = { 0.0, 0.0, 0.0 }
-}
-
-style "settings_notebook" = "big_text"
-{
-
-}
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 23bbd5b9ea..04d25e24e7 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -286,9 +286,11 @@ UIConfiguration::load_defaults ()
 		}
 		
 		_dirty = false;
-	}
 
-	ARDOUR_UI_UTILS::ColorsChanged ();
+		ARDOUR_UI_UTILS::ColorsChanged ();
+	} else {
+		warning << string_compose (_("Could not find default UI configuration file %1"), default_ui_config_file_name) << endmsg;
+	}
 
 	return found;
 }
diff --git a/gtk2_ardour/ui_dark.rc.in b/gtk2_ardour/ui_dark.rc.in
deleted file mode 100644
index 5c6a00065d..0000000000
--- a/gtk2_ardour/ui_dark.rc.in
+++ /dev/null
@@ -1,355 +0,0 @@
-#
-# This is the GTK style file for Ardour, originally by Paul Davis and others
-#
-# Color meta-ization originated by Sean Corbett (seanbutnotheard@gmail.com)
-#
-# Released under the terms of the GNU GPL v2:  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-
-#@color fg #EEEEEC
-#@color bg #54555d
-#@color text #EEEEEC
-#@color light_text_on_dark #CFCFC1
-#@color base #171717
-#@color fg_selected #EEF
-#@color bg_selected #58B
-#@color fg_tooltip #1F1F1F
-#@color bg_tooltip #FCF5B8
-
-#@color lightest #FFFFFF
-#@color darkest #222
-#@color bright_indicator #F11
-#@color contrasting_indicator #9f3
-#@color somewhat_bright_indicator #CEF
-#@color not_so_bright_indicator #FC4
-#@color bright_color #729FCF
-
-#@color arm #F33
-#@color solo #A8F730
-#@color midi_channel_selector #005900
-#@color mute #FFFA87
-#@color mono #DEC
-#@color monitor #FFAB34
-#@color control_text2 #8D2B1B
-#@color control_base #26292D
-#@color control_text #D0D2D5
-#@color audio_track #33445e
-#@color midi_track #445033
-#@color audio_bus #262c35
-
-#@color send_fg #9FD5C1
-#@color send_bg #33445e
-
-#@color processor_frame_selected #E2CC33
-#@color processor_fader #666666
-#@color processor_fader_frame #7F7F7F
-#@color processor_prefader #4D0000
-#@color processor_prefader_frame #7F0000
-#@color processor_postfader #1A4D1A
-#@color processor_postfader_frame #1B7F1B
-
-# Tweak the color scheme in one place :
-
-gtk_color_scheme = "@COLOR_SCHEME@"
-
-#alternate BG color: #5C5E61
-
-style "default" = "medium_text"
-{
-  #Original values for reference
-
-  GtkTreeView::vertical-padding = 0
-  GtkTreeView::horizontal-padding = 0
-  GtkTreeView::even-row-color = shade(0.25,@@COLPREFIX@_base)
-  GtkTreeView::odd-row-color = lighter(lighter(@@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.
-  GtkWidget           :: focus-padding                    = 1                 # [               1 ] ( >= 0 ) Width, in pixels, between focus indicator and the widget box.
-  GtkWidget           :: interior-focus                   = 1                 # [               1 ] ( bool ) Draw the focus indicator inside widgets.
-  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, @@COLPREFIX@_bright_color)
-  GtkWidget           :: visited-link-color               = @@COLPREFIX@_bright_color
-  
-  GtkDialog           :: action-area-border               = 4                 # [               5 ] ( >= 0 ) Width of border around the button area at the bottom of the dialog.
-  GtkDialog           :: button-spacing                   = 4                 # [               6 ] ( >= 0 ) Spacing between buttons.
-  GtkDialog           :: content-area-border              = 2                 # [               2 ] ( >= 0 ) Width of border around the main dialog area.
-  GtkDialog           :: content-area-spacing             = 0                 # [               0 ] ( >= 0 ) The default spacing used between elements of the content area of the dialog.
-  
-
-  GtkButton           :: default-border = { 0, 0, 0, 0 }
-  GtkButton           :: default-outside_border = { 0, 0, 0, 0 }
-  GtkButton           :: button-relief = GTK_RELIEF_NONE
-  GtkButton           :: child-displacement-x             = 1                 # [               0 ]          How far in x direction to move the button when its depressed.
-  GtkButton           :: child-displacement-y             = 1                 # [               0 ]          ... y
-  GtkButton           :: default-border                   = { 0, 0, 0, 0 }    #                              Extra space to add for CAN_DEFAULT buttons.
-  GtkButton           :: displace-focus                   = 0                 # [               0 ] ( bool ) Whether the child_displacement_x/child_displacement_y properties should also affect the focus rectangle.
-  GtkButton           :: image-spacing                    = 2                 # [               2 ] ( >= 0 ) Spacing in pixels between the image and label.
-
-  GtkCheckButton      :: indicator-size                   = 13                # [              13 ] ( >= 0 ) Size of check or radio indicator.
-  GtkCheckButton      :: indicator-spacing                = 2                 # [               2 ] ( >= 0 ) Spacing around check or radio indicator.
-  GtkCheckMenuItem    :: indicator-size                   = 13                # [              13 ] ( >= 0 ) Size of check or radio indicator.
-
-  GtkOptionMenu       :: indicator-size                   = { 6, 10 }         #                              Size of dropdown indicator.
-  GtkOptionMenu       :: indicator-spacing                = {	6, 5, 0, 0 }    #                              Spacing around indicator.
-
-  GtkComboBox         :: appears-as-list                  = 0                 # [               0 ] ( bool ) Whether dropdowns should look like lists rather than menus.
-  GtkComboBox         :: arrow-size                       = 13                # [              15 ] ( >= 0 ) Sets the minimum size of the arrow in the combo box.
-  GtkComboBox         :: shadow-type                      = GTK_SHADOW_NONE   # [ GTK_SHADOW_NONE ]          Which kind of shadow to draw around the combo box.
-
-  GtkPaned            :: handle-size                      = 4                 # [               5 ] ( >= 0 ) Width of handle.
-
-  GtkScale            :: activate-slider                  = 1                 # [               0 ] ( bool ) With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged.
-  GtkScale            :: slider-length                    = 23                # [              31 ] ( >= 0 ) Length of scale's slider.	
-  GtkScale            :: slider-width                     = 14                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.
-  GtkScale            :: trough-side-details              = 1                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.
-
-  GtkScrollbar        :: activate-slider                  = 1                 # [               0 ] ( bool ) With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged.
-  GtkScrollbar        :: arrow-scaling                    = 0.4               # [             0.5 ] ( 0.1  ) The arrow size proportion relative to the scroll button size.
-  GtkScrollbar        :: fixed-slider-length              = 0                 # [               0 ] ( bool ) Don't change slider size, just lock it to the minimum length.
-  GtkScrollbar        :: min-slider-length                = 50                # [              21 ] ( >= 0 ) Minimum length of scrollbar slider.
-  GtkScrollbar        :: slider-width                     = 15                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.    
-  GtkScrollbar        :: stepper-spacing                  = 0                 # [               0 ] ( >= 0 ) The spacing between the stepper buttons and thumb. Note that setting this value to anything > 0 will automatically set the trough-under-steppers style property to TRUE as well. Also, stepper-spacing won't have any effect if there are no steppers.
-  GtkScrollbar        :: trough-border                    = 0                 # [               1 ] ( >= 0 ) Spacing between thumb/steppers and outer trough bevel.
-  GtkScrollbar        :: trough-side-details              = 0                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.    
-  GtkScrollbar        :: trough-under-steppers            = 1                 # [               1 ] ( bool ) Whether to draw the trough across the full length of the range or to exclude the steppers and their spacing. Note that setting the "stepper-spacing" style property to any value > 0 will automatically enable trough-under-steppers too.
-
-  GtkScrollbar        :: has-backward-stepper             = 1                 # [               1 ] ( bool ) Display the standard backward arrow button.
-  GtkScrollbar        :: has-forward-stepper              = 1                 # [               1 ] ( bool ) Display the standard forward arrow button.
-  GtkScrollbar        :: has-secondary-backward-stepper   = 0                 # [               0 ] ( bool ) Display a second backward arrow button on the opposite end of the scrollbar.
-  GtkScrollbar        :: has-secondary-forward-stepper    = 0                 # [               0 ] ( bool ) Display a second forward arrow button on the opposite end of the scrollbar.
-
-  GtkHScrollbar       :: has-secondary-backward-stepper   = 0                 # [               0 ] ( bool ) Display a second backward arrow button on the opposite end of the scrollbar.
-  GtkHScrollbar       :: has-secondary-forward-stepper    = 0                 # [               0 ] ( bool ) Display a second forward arrow button on the opposite end of the scrollbar.
-  GtkVScrollbar       :: has-secondary-backward-stepper   = 0                 # [               0 ] ( bool ) Display a second backward arrow button on the opposite end of the scrollbar.
-  GtkVScrollbar       :: has-secondary-forward-stepper    = 0                 # [               0 ] ( bool ) Display a second forward arrow button on the opposite end of the scrollbar.
-
-#Menu Properties
-  GtkMenuBar          :: internal-padding                 = 1                 # [               1 ] ( >= 0 ) Amount of border space between the menubar shadow and the menu items.
-  GtkMenuBar          :: shadow-type                      = GTK_SHADOW_OUT    # [  GTK_SHADOW_OUT ]          Style of bevel around the menubar. 
-
-  GtkMenu             :: arrow-placement                  = GTK_ARROWS_BOTH   # [ GTK_ARROWS_BOTH ]          Indicates where scroll arrows should be placed.
-  GtkMenu             :: arrow-scaling                    = 0.5               # [             0.7 ] ( 0.1  ) Arbitrary constant to scale down the size of the scroll arrow.
-  GtkMenu             :: double-arrows                    = 1                 # [               1 ] ( bool ) When scrolling, always show both arrows.
-  GtkMenu             :: horizontal-offset                = -2                # [              -2 ]          When the menu is a submenu, position it this number of pixels offset horizontally.
-  GtkMenu             :: horizontal-padding               = 0                 # [               0 ] ( >= 0 ) Extra space at the left and right edges of the menu.
-  GtkMenu             :: vertical-offset                  = 0                 # [               0 ]          When the menu is a submenu, position it this number of pixels offset vertically.
-  GtkMenu             :: vertical-padding                 = 0                 # [               0 ] ( >= 0 ) Extra space at the top and bottom of the menu.
-
-  GtkMenuItem         :: arrow-scaling                    = 0.5               # [             0.8 ] ( 0.2  ) Amount of space used up by arrow, relative to the menu item's font size.
-  GtkMenuItem         :: arrow-spacing                    = 10                # [              10 ] ( >= 0 ) Space between label and arrow.
-  GtkMenuItem         :: horizontal-padding               = 3                 # [               3 ] ( >= 0 ) Padding to left and right of the menu item.
-  GtkMenuItem         :: selected-shadow-type             = GTK_SHADOW_NONE   # [ GTK_SHADOW_NONE ]          Shadow type when item is selected.
-  #GtkMenuItem         :: toggle-spacing                   = 4                 # [               5 ] ( >= 0 ) Space between icon and label.
-  GtkMenuItem         :: width-chars                      = 12                # [              12 ] ( >= 0 ) The minimum desired width of the menu item in characters.
-
-#Other Properties
-  GtkArrow            :: arrow-scaling                    = 0.5               # [             0.7 ] ( 0.1  ) Amount of space used up by arrow.
-
-  GtkNotebook         :: arrow-spacing                    = 0                 # [               0 ] ( >= 0 ) Spacing between the scroll arrows and the tabs.
-  GtkNotebook         :: tab-curvature                    = 1                 # [               1 ] ( >= 0 ) Size of tab curvature.
-  GtkNotebook         :: tab-overlap                      = 1                 # [               2 ]          Size of tab overlap area.
-
-  GtkTreeView         :: horizontal-separator             = 8                 # [               2 ] ( >= 0 ) Horizontal space between cells. Must be an even number.
-  GtkTreeView         :: vertical-separator               = 2                 # [               2 ] ( >= 0 ) Vertical space between cells. Must be an even number.
-
-  GtkEntry            :: honors-transparent-bg-hint       = 1                 # [               0 ] ( bool ) (Clearlooks) Without this, gecko will fill in the background of the entry.
-  GtkEntry            :: cursor-color = @@COLPREFIX@_fg_selected
-
-  #GtkToolbar::shadow_type = GTK_SHADOW_ETCHED_IN
-
-  #xthickness = 0
-  #ythickness = 0
-
-#Base Colors
-  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@_lightest)
-  text[SELECTED]      = @@COLPREFIX@_fg_selected
-
-#engine specific tweaks
-
-  engine "clearlooks" 
-  {
-    #style              = GLOSSY
-    #colorize_scrollbar = TRUE
-    menubarstyle       = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
-    #toolbarstyle       = 0 # 0 = flat, 1 = enable effects
-  }
-}
-
-
-style "track_controls_inactive" 
-{
-	bg[NORMAL] =      { 0.60, 0.20, 0.26 }
-	bg[ACTIVE] =      { 0.60, 0.60, 0.66 }
-	bg[INSENSITIVE] = { 0.60, 0.60, 0.66 }
-	bg[SELECTED] =    { 0.60, 0.60, 0.66 }
-	bg[PRELIGHT] =    { 0.60, 0.60, 0.66 }
-
-	fg[NORMAL] = { 0.7, 0.8, 0.2 }	
-}
-
-
-#
-# Track edit groups. These styles define
-# the colors that the "edit" button will
-# use as a track is moved from
-# track edit group to track edit group.
-# There are 8 edit groups. Edit group 0
-# is used for tracks that are not editable, 
-# so we leave its style to the default.
-#
-
-style "edit_group_0"
-
-{
-	bg[ACTIVE] = { 1.0, 0.65, 0.13 }
-	bg[NORMAL] = { 0.31, 0.31, 0.31 }
-	fg[NORMAL] = { 0.82, 0.91, 0.99 }
-	fg[ACTIVE] = { 0, 0, 0 }
-}
-
-style "edit_group_1" 
-{
-	fg[NORMAL] = { 0, 0, 0 }
-	fg[PRELIGHT] = { 0, 0, 0 }
-	fg[SELECTED] = { 0, 0, 0 }
-	bg[NORMAL] = { 0.93, 0.34, 0.08 }
-	bg[PRELIGHT] = { 0.93, 0.34, 0.08 }
-	bg[SELECTED] = { 0.93, 0.34, 0.08 }
-}
-
-style "edit_group_2" 
-{
-	fg[NORMAL] = { 0, 0, 0 }
-	fg[PRELIGHT] = { 0, 0, 0 }
-	fg[SELECTED] = { 0, 0, 0 }
-	bg[NORMAL] = { 0.93, 0.34, 0.08 }
-	bg[PRELIGHT] = { 0.93, 0.34, 0.08 }
-	bg[SELECTED] = { 0.93, 0.34, 0.08 }
-}
-
-style "edit_group_3" 
-{
-	fg[NORMAL] = { 0, 0, 0 }
-	fg[PRELIGHT] = { 0, 0, 0 }
-	fg[SELECTED] = { 0, 0, 0 }
-	bg[NORMAL] = { 0.93, 0.34, 0.08 }
-	bg[PRELIGHT] = { 0.93, 0.34, 0.08 }
-	bg[SELECTED] = { 0.93, 0.34, 0.08 }
-}
-
-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.75, 0.75 }    
-
-	# 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] = { 1.0, 1.0, 1.0 }  
-
-	# selected row text without window focus (including during DnD)
-	text[ACTIVE] = { 1.0, 1.0, 1.0 }  
-}
-
-style "main_canvas_area"
-{
-	bg[NORMAL] = { 0.30, 0.30, 0.34 }
-	bg[ACTIVE] = { 0.30, 0.30, 0.34 }
-	bg[INSENSITIVE] = { 0.30, 0.30, 0.34 }
-	bg[SELECTED] = { 0.30, 0.30, 0.34 }
-	bg[PRELIGHT] = { 0.30, 0.30, 0.34 }
-}
-
-style "track_controls_inactive" = "larger_text"
-{
-	bg[NORMAL] =      { 0.60, 0.60, 0.66 }
-	bg[ACTIVE] =      { 0.60, 0.60, 0.66 }
-	bg[INSENSITIVE] = { 0.60, 0.60, 0.66 }
-	bg[SELECTED] =    { 0.60, 0.60, 0.66 }
-	bg[PRELIGHT] =    { 0.60, 0.60, 0.66 }
-
-	fg[NORMAL] = { 0.7, 0.8, 0.2 }	
-}
-
-style "edit_controls_base_selected"
-{
-	bg[NORMAL] = { 0.32, 0.32, 0.54 }
-	bg[ACTIVE] = { 0.32, 0.32, 0.54 }
-	bg[INSENSITIVE] = { 0.32, 0.32, 0.54 }
-	bg[SELECTED] = { 0.32, 0.32, 0.54 }
-	bg[PRELIGHT] = { 0.32, 0.32, 0.54 }
-}
-
-style "automation_track_controls_base"
-{
-	bg[NORMAL] = { 0.22, 0.22, 0.29 }
-	bg[ACTIVE] = { 0.22, 0.22, 0.29 }
-	bg[INSENSITIVE] = { 0.22, 0.22, 0.29 }
-	bg[SELECTED] = { 0.22, 0.22, 0.29 }
-	bg[PRELIGHT] = { 0.22, 0.22, 0.29 }
-}
-
-
-style "inspector_processor_list" = "processor_list"
-{
- 	base[SELECTED] = { 0.3, 0.3, 0.3 }
-}
-
-style "time_info_box" 
-{
-        bg[NORMAL] = { 0.149, 0.149, 0.149 }
-}
-
-style "status_bar_box" 
-{
-        bg[NORMAL] = { 0.149, 0.149, 0.149 }
-}
-
-##include dark_fonts.rc
-##include dark_styles.rc
-##include widgets.rc
diff --git a/gtk2_ardour/widget_list.rc b/gtk2_ardour/widget_list.rc
deleted file mode 100644
index 2739eab9bf..0000000000
--- a/gtk2_ardour/widget_list.rc
+++ /dev/null
@@ -1,216 +0,0 @@
-class "GtkWidget" style:highest "default"
-class "GtkScrollbar" style:highest "ardour_adjusters"
-class "GtkLabel" style:highest "default_generic"
-class "GtkButton" style:highest "ardour_button"
-class "GtkCheckButton" style:highest "ardour_button"
-class "GtkArrow" style:highest "tearoff_arrow"
-class "GtkProgressBar" style:highest "ardour_progressbars"
-
-
-widget "*PaddedButton" style:highest "padded_button"
-widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
-widget "*MarkerText" style:highest "marker_text"
-widget "*ArdourContextMenu*" style:highest "default_menu"
-widget "*ErrorLogCloseButton" style:highest "default_button"
-widget "*EditorGTKButton*" style:highest "default_button" 
-widget "*CrossfadeEditButton" style:highest "default_button"
-widget "*CrossfadeEditButton*" style:highest "default_button"
-
-widget "*mixer strip button" style:highest "very_small_button"
-
-widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
-widget "*OptionsNotebook" style:highest "preferences"
-widget "*OptionsLabel" style:highest "preferences"
-widget "*OptionsEntry" style:highest "option_entry"
-widget "*InspectorNotebook" style:highest "preferences"
-widget "*EditorRulerLabel*" style:highest "ruler_label"
-widget "*MixerAutomationModeButton*" style:highest "very_small_button"
-widget "*MixerAutomationModeButton.*" style:highest "very_small_button"
-widget "*MixerAutomationPlaybackButton*" style:highest "very_small_button"
-widget "*MixerAutomationPlaybackButton.*" style:highest "very_small_button"
-widget "*ShuttleControl" style:highest "shuttle_control"
-#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"
-widget "*WarningMessage" style:highest "warning_message"
-
-widget "*big clock" style:highest "monospace massive_text"
-widget "*selection clock" style:highest "small_mono_text"
-widget "*punch clock" style:highest "small_mono_text"
-widget "*transport clock" style:highest "bigger_mono_text"
-widget "*secondary clock" style:highest "bigger_mono_text"
-widget "*transport delta clock" style:highest "bigger_mono_text"
-widget "*secondary delta clock" style:highest "bigger_mono_text"
-widget "*silence duration clock" style:highest "medium_text"
-widget "*edit point clock" style:highest "medium_text"
-widget "*nudge clock" style:highest "small_mono_text"
-widget "*menubar clock" style:highest "medium_text"
-widget "*zoomrange clock" style:highest "medium_text"
-widget "*timecodeoffset clock" style:highest "medium_text"
-
-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"
-widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
-widget "*AudioBusStripBaseInactive" style:highest "track_controls_inactive"
-widget "*MidiTrackStripBaseInactive" style:highest "track_controls_inactive"
-widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
-widget "*MidiTrackMetrics" style:highest "midi_track_metrics"
-widget "*AudioBusMetrics" style:highest "audio_bus_metrics"
-widget "*AudioMidiTrackMetrics" style:highest "midi_track_metrics"
-widget "*AudioTrackMetricsLeft" style:highest "audio_track_metrics"
-widget "*MidiTrackMetricsLeft" style:highest "midi_track_metrics"
-widget "*AudioBusMetricsLeft" style:highest "audio_bus_metrics"
-widget "*AudioMidiTrackMetricsLeft" style:highest "midi_track_metrics"
-widget "*AudioTrackMetricsRight" style:highest "audio_track_metrics"
-widget "*MidiTrackMetricsRight" style:highest "midi_track_metrics"
-widget "*AudioBusMetricsRight" style:highest "audio_bus_metrics"
-widget "*AudioMidiTrackMetricsRight" style:highest "midi_track_metrics"
-widget "*AudioTrackMetricsInactive" style:highest "audio_track_metrics_inactive"
-widget "*MidiTrackMetricsInactive" style:highest "midi_track_metrics_inactive"
-widget "*AudioBusMetricsInactive" style:highest "audio_bus_metrics_inactive"
-widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inactive"
-
-widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
-widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
-widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
-
-widget "*SendUIFader" style:highest "plugin_slider"
-widget "*ReturnUIFader" style:highest "plugin_slider"
-
-widget "*AudioTrackFader" style:highest "audio_track_fader"
-widget "*MidiTrackFader" style:highest "midi_track_fader"
-widget "*AudioBusFader" style:highest "audio_bus_fader"
-
-widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
-widget "*TrackSeparator" style:highest "track_separator"
-widget "*EditorTrackNameDisplay" style:highest "track_name_display"
-widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
-widget "*CrossfadeEditAuditionButton" style:highest "bright_when_active"
-widget "*CrossfadeEditAuditionButton*" style:highest "bright_when_active"
-widget "*CrossfadeEditCurveButton" style:highest "bright_when_active"
-widget "*CrossfadeEditCurveButton*" style:highest "bright_when_active"
-widget "*CrossfadeEditFrame" style:highest "base_frame"
-widget "*EditorMainCanvas" style:highest "main_canvas_area"
-widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*BusControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*AudioTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
-widget "*MidiTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
-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 "*PluginParameterLabel" style:highest "medium_text"
-widget "*MotionControllerValue" style:highest "small_entry"
-widget "*MotionControllerValue*" style:highest "small_entry"
-widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
-widget "*ProcessorControlSlider" style:highest "processor_control_slider"
-widget "*processor control button" style:highest "processor_control_button"
-widget "*PluginSlider" style:highest "plugin_slider"
-widget "*GainFader" style:highest "plugin_slider"
-widget "*MixerTrackCommentArea" style:highest "option_entry"
-widget "*MixerPanZone" style:highest "pan_zone"
-widget "*RegionEditorLabel" style:highest "medium_text"
-widget "*RegionEditorEntry" style:highest "medium_entry"
-widget "*MixerStripGainDisplay" style:highest "small_entry"
-widget "*MixerStripGainDisplay*" style:highest "small_entry"
-widget "*MixerStripPeakDisplay" style:highest "red_active_small_entry"
-widget "*MixerStripPeakDisplay*" style:highest "red_active_small_entry"
-widget "*MixerStripPeakDisplayPeak*" style:highest "peak_display_peaked_entry"
-widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame"
-widget "*MixerStripFrame" style:highest "base_frame"
-widget "*FadeCurve" style:highest "medium_bold_entry"
-widget "*FadeCurve*" style:highest "medium_bold_entry"
-widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
-widget "*TearOffArrow" style:highest "tearoff_arrow"
-widget "*RouteParamsTitleLabel" style:highest "medium_text"
-widget "*PluginAutomateButton" style:highest "small_button"
-widget "*PluginAutomateButton*" style:highest "small_button"
-widget "*PluginSaveButton" style:highest "small_button"
-widget "*PluginSaveButton*" style:highest "small_button"
-widget "*PluginEditorButton*" style:highest "default_toggle_button"
-widget "*PluginEditorButton-active" style:highest "default_toggle_button_active"
-
-widget "*BarControlSpinner" style:highest "small_spinner"
-widget "*BarControlSpinner*" style:highest "small_spinner"
-
-widget "*meterstripPPM" style:highest "meter_strip_ppm"
-widget "*meterstripDPM" style:highest "meter_strip_dpm"
-widget "*meterstripVU" style:highest "meter_strip_vu"
-widget "*BlackSeparator" style:highest "meter_strip_sep"
-
-widget "*MetricLabel" style:highest "medium_text"
-widget "*ChoiceWindow" style:highest "default_generic"
-widget "*TrackLabel" style:highest "medium_text"
-widget "*TrackParameterName" style:highest "small_italic_text"
-widget "*AddRouteDialog*" style:highest "medium_text"
-widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
-widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
-widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
-widget "*NewSessionSR1Label" style:highest "red_medium_text"
-widget "*NewSessionSR2Label" style:highest "medium_text"
-widget "*location edit row clock" style:highest "medium_text"
-widget "*LocationEditNameLabel" style:highest "medium_text"
-widget "*LocationEditCdButton" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditCdButton*" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditHideButton" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditHideButton*" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditLockButton*" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditGlueButton*" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditNumberLabel" style:highest "small_text"
-widget "*LocationEditNameEntry" style:highest "option_entry"
-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 "*ChannelCountSelector" style:highest "medium_bold_entry"
-widget "*RegionListWholeFile" style:highest "treeview_parent_node"
-widget "*ProcessorList*" style:highest "processor_list"
-widget "*PortMatrixLabel*" style:highest "small_text"
-widget "*midi device" style:highest "midi_device"
-widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
-widget "*solo isolate" style:highest "solo_isolate"
-widget "*meterbridge label" style:highest "meterbridge_label"
-widget "*solo safe" style:highest "solo_safe"
-widget "*ContrastingPopup" style:highest "contrasting_popup"
-widget "*ContrastingPopup*" style:highest "contrasting_popup"
-widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
-widget "*TimeInfoSelectionTitle" style:highest "very_small_text"
-widget "*TimeInfoSelectionLabel" style:highest "very_small_text"
-widget "*TimeInfoBox" style:highest "time_info_box"
-widget "*tracknumber label" style:highest "tracknumber_label"
-widget "*StatusBarBox" style:highest "status_bar_box"
-widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
-widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
-widget "*MeasureLatencyButton" style:highest "default_toggle_button"
-widget "*processor prefader" style:highest "processor"
-widget "*processor fader" style:highest "processor"
-widget "*processor postfader" style:highest "processor"
-widget "*MonitorSectionLabel" style:highest "small_text"
-widget "*record enable button" style:highest "small_button"
-widget "*mute button" style:highest "small_button"
-widget "*invert button" style:highest "small_button"
-widget "*send alert button" style:highest "small_text"
-widget "*solo button" style:highest "small_button"
-widget "*route button" style:highest "small_button"
-widget "*monitor button" style:highest "small_button"
-widget "*rude solo" style:highest "small_text"
-widget "*rude audition" style:highest "small_text"
-widget "*feedback alert" style:highest "small_text"
-widget "*transport option button" style:highest "small_text"
-widget "*transport active option button" style:highest "small_text"
-widget "*plugin bypass button" style:highest "small_text"
-widget "*punch button" style:highest "small_text"
-widget "*lock button" style:highest "large_bold_text"
-widget "*ooltip*" style:highest "tooltip"
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 16b1a0a393..ab04d7b7d3 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -527,9 +527,7 @@ def build(bld):
 
     # Font configuration
 
-    dark_rc_subst_dict = {}
-    light_rc_subst_dict = {}
-    ui_conf_dict = {}
+    font_subst_dict = {}
     font_sizes      = {}
     base_font       = ""
 
@@ -587,93 +585,32 @@ def build(bld):
             else:
                 key = "_".join (['FONT',sizename])
                 fontstyle = " ".join ([basefont,points])
-
-            dark_rc_subst_dict[key] = fontstyle
-            light_rc_subst_dict[key] = fontstyle
-            ui_conf_dict[key] = points
+                
+            font_subst_dict[key] = fontstyle
             
     # @FONT_SIZE_XXXX@
     for sizename,points in iter(font_sizes.items()):
             key = "_".join (['FONT_SIZE',sizename])
-            dark_rc_subst_dict[key] = points
-            light_rc_subst_dict[key] = points
-            ui_conf_dict[key] = points
+            font_subst_dict[key] = points
 
     # various font names, eg @BOLD_MONOSPACE@
     for font_sym,text in iter(font_names.items()):
         key = font_sym
-        dark_rc_subst_dict[key] = text
-        light_rc_subst_dict[key] = text
-        ui_conf_dict[key] = text
-
-    # RC files
-    dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
-        'gtk2_ardour/ui_dark.rc.in', 'ARDOUR_DARK')
-    dark_rc_subst_dict['COLPREFIX'] = 'ARDOUR_DARK'
-    light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
-        'gtk2_ardour/ui_light.rc.in', 'ARDOUR_LIGHT')
-    light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
-
-    obj              = bld(features = 'subst')
-    obj.source       = [ 'ui_dark.rc.in' ]
-    obj.target       = 'ui_dark.rc.pre'
-    obj.install_path = None
-    set_subst_dict(obj, dark_rc_subst_dict)
+        font_subst_dict[key] = text
 
-    obj              = bld(features = 'subst')
-    obj.source       = [ 'ui_light.rc.in' ]
-    obj.target       = 'ui_light.rc.pre'
-    obj.install_path = None
-    set_subst_dict(obj, light_rc_subst_dict)
+    # RC file
 
     obj              = bld(features = 'subst')
-    obj.source       = [ 'styles.rc.in' ]
-    obj.target       = 'dark_styles.rc'
-    obj.install_path = None
-    set_subst_dict(obj, dark_rc_subst_dict)
-
-    obj              = bld(features = 'subst')
-    obj.source       = [ 'styles.rc.in' ]
-    obj.target       = 'light_styles.rc'
-    obj.install_path = None
-    set_subst_dict(obj, light_rc_subst_dict)
-
-    obj              = bld(features = 'subst')
-    obj.source       = [ 'fonts.rc.in' ]
-    obj.target       = 'dark_fonts.rc'
-    obj.install_path = None
-    set_subst_dict(obj, dark_rc_subst_dict)
-
-    obj              = bld(features = 'subst')
-    obj.source       = [ 'fonts.rc.in' ]
-    obj.target       = 'light_fonts.rc'
-    obj.install_path = None
-    set_subst_dict(obj, light_rc_subst_dict)
-
-    obj              = bld(rule = autowaf.copyfile) 
-    obj.source       = [ 'widget_list.rc' ]
-    obj.target       = 'widgets.rc'
-    obj.install_path = None
-
-    obj = bld (rule = include_processor)
-    obj.source = [ 'ui_dark.rc.pre' ]
-    # find and add all ##include dependencies as sources
-    obj.source += _doPyp (bld.path.find_resource ('ui_dark.rc.in').srcpath(), True)
-    obj.target = 'ui_dark.rc'
-    obj.install_path = bld.env['CONFDIR']
-
-    obj = bld (rule = include_processor)
-    obj.source = [ 'ui_light.rc.pre' ]
-    # find and add all ##include dependencies as sources
-    obj.source += _doPyp (bld.path.find_resource ('ui_light.rc.in').srcpath(), True)
-    obj.target = 'ui_light.rc'
+    obj.source       = [ 'clearlooks.rc.in' ]
+    obj.target       = 'clearlooks.rc'
     obj.install_path = bld.env['CONFDIR']
+    set_subst_dict(obj, font_subst_dict)
 
     obj              = bld(features = 'subst')
     obj.source       = [ 'default_ui_config.in' ]
     obj.target       = 'default_ui_config'
-    obj.install_path = None
-    set_subst_dict(obj, ui_conf_dict)
+    obj.install_path = bld.env['CONFDIR']
+    set_subst_dict(obj, font_subst_dict)
 
     # Menus
     menus_argv = []