split style files apart to better maintain consistency (generates a useless error during program startup - thanks GTK); metronome icon for (moved) click button; move punch in/out buttons around

git-svn-id: svn://localhost/ardour2/branches/3.0@9697 d708f5d6-7413-0410-9779-e7cbd77b26cf

11 files changed, 1627 insertions, 3090 deletions

diff --git a/gtk2_ardour/ardour3_fonts.rc.in b/gtk2_ardour/ardour3_fonts.rc.in
new file mode 100644
index 0000000000..8fbf37c30a
--- /dev/null
+++ b/gtk2_ardour/ardour3_fonts.rc.in
@@ -0,0 +1,93 @@
+style "smallest_text"
+{
+	font_name = "@FONT_TINY@"
+}
+
+style "very_small_text"
+{
+ 	font_name = "@FONT_SMALLER@"
+}
+
+style "small_text"
+{
+ 	font_name = "@FONT_SMALL@"
+}
+
+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_BIGGER@"
+}
+
+style "larger_text"
+{
+ 	font_name = "@FONT_LARGE@"
+}
+
+style "larger_bold_text"
+{
+ 	font_name = "bold @FONT_LARGE@"
+}
+
+style "big_bold_text"
+{
+	font_name = "bold @FONT_LARGER@"
+}
+
+style "plugin_name_text" = "big_bold_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_text
+}
+
+style "plugin_maker_text" = "larger_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/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
new file mode 100644
index 0000000000..f8afec52b1
--- /dev/null
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -0,0 +1,1070 @@
+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 "mouse_mode_button" = "default_button"
+{
+        bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+        fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "default_menu" = "medium_text"
+{
+  #bg[NORMAL] = darker(@@COLPREFIX@_bg)
+}
+
+style "default_generic" = "medium_text"
+{
+}
+
+style "text_cell_entry" = "medium_text"
+{
+	GtkWidget::cursor_color =  @@COLPREFIX@_darkest
+}
+
+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 "punch_button" = "very_small_red_active_and_selected_button"
+{
+ 	font_name = "@FONT_SMALLER@"
+
+	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 "gain_fader"
+{
+        bg[NORMAL] = shade (0.7, @@COLPREFIX@_lightest)
+	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_lightest)
+}
+
+#MSR and related buttons
+
+style "track_rec_enable_button" = "small_button"
+{
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+        bg[NORMAL] =   mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
+        bg[PRELIGHT] = shade(1.1,mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
+}
+
+style "track_rec_enable_button_active" = "small_button"
+{
+	#fg[ACTIVE] =   @@COLPREFIX@_darkest
+	#fg[SELECTED] = @@COLPREFIX@_darkest
+	#fg[PRELIGHT] = @@COLPREFIX@_darkest
+	#fg[NORMAL] = @@COLPREFIX@_darkest
+
+	bg[NORMAL] =   @@COLPREFIX@_arm
+	bg[ACTIVE] =   @@COLPREFIX@_arm
+	bg[SELECTED] =   @@COLPREFIX@_arm
+	bg[PRELIGHT] =   shade(1.1, @@COLPREFIX@_arm)
+}
+
+style "track_rec_enable_button_alternate" = "small_button"
+{
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+
+	bg[NORMAL] =   lighter(@@COLPREFIX@_arm)
+	bg[ACTIVE] =   lighter(@@COLPREFIX@_arm)
+	bg[SELECTED] =   lighter(@@COLPREFIX@_arm)
+	bg[PRELIGHT] =   shade(1.1, lighter(@@COLPREFIX@_arm))
+}
+
+style "track_rec_enable_button_alternate_two" = "small_button"
+{
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+
+	bg[NORMAL] =   darker(@@COLPREFIX@_arm)
+	bg[ACTIVE] =   darker(@@COLPREFIX@_arm)
+	bg[SELECTED] =   darker(@@COLPREFIX@_arm)
+	bg[PRELIGHT] =   shade(1.1, darker(@@COLPREFIX@_arm))
+}
+
+style "mixer_track_rec_enable_button" = "track_rec_enable_button"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+
+style "solo_button" = "small_button"
+{
+  bg[NORMAL] = mix(0.1,@@COLPREFIX@_solo,@@COLPREFIX@_bg)
+  bg[ACTIVE] = @@COLPREFIX@_solo
+  fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "solo_isolate_led"
+{
+  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
+  fg[ACTIVE] = @@COLPREFIX@_isolate
+}
+
+style "solo_safe_led"
+{
+  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
+  fg[ACTIVE] = @@COLPREFIX@_isolate
+}
+
+style "solo_button_alternate" = "small_button"
+{
+        #
+        # this is the "solo-isolated" solo theme
+        #
+
+	bg[ACTIVE] = lighter(@@COLPREFIX@_solo)
+
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	fg[NORMAL] = @@COLPREFIX@_bright_indicator
+	fg[PRELIGHT] = shade(1.1, @@COLPREFIX@_bright_indicator)
+}
+
+style "solo_button_alternate2" = "small_button"
+{
+        #
+        # this is the "half-bright" solo theme
+        #
+
+	bg[NORMAL] = darker(@@COLPREFIX@_solo) 
+	bg[ACTIVE] = darker(@@COLPREFIX@_solo)
+	bg[SELECTED] = darker(@@COLPREFIX@_solo)
+	bg[PRELIGHT] = shade(1.1, darker(@@COLPREFIX@_solo))
+
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+}
+
+style "solo_button_active" = "small_button"
+{
+        #
+        # this is the "full-bright" solo theme
+        #
+
+	bg[NORMAL] = @@COLPREFIX@_solo
+	bg[ACTIVE] = @@COLPREFIX@_solo
+	bg[SELECTED] = @@COLPREFIX@_solo
+	bg[PRELIGHT] = shade(1.1, @@COLPREFIX@_solo)
+
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+}
+
+style "mixer_invert_button" = "small_button"
+{
+	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "mixer_solo_button" = "solo_button"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_solo_button_alternate" = "solo_button_alternate"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_solo_button_alternate2" = "solo_button_alternate2"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+
+style "mixer_solo_button_active" = "solo_button_active"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "monitor_opt_button" = "small_button"
+{
+        bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
+	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "monitor_mono_button" = "small_button"
+{
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mono,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_mono
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "monitor_invert_button" = "small_button"
+{
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "monitor_mute_button" = "small_button"
+{
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_mute
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "monitor_dim_button" = "small_button"
+{
+	bg[NORMAL] = mix(0.1,lighter(@@COLPREFIX@_mute),@@COLPREFIX@_bg)
+        bg[ACTIVE] = lighter(@@COLPREFIX@_mute)
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "monitor_iso_button" = "small_button"
+{
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_somewhat_bright_indicator,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "mute_button" = "small_button"
+{
+	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
+        bg[ACTIVE] = @@COLPREFIX@_mute
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "mute_button_fullylit" = "small_button"
+{
+        # this is the normal "active" state for a mute button
+
+	bg[ACTIVE] = @@COLPREFIX@_mute
+	bg[NORMAL] = @@COLPREFIX@_mute
+	bg[SELECTED] = @@COLPREFIX@_mute
+	bg[PRELIGHT] = lighter (@@COLPREFIX@_mute)
+
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+}
+
+style "mute_button_halflit" = "small_button"
+{
+ 	bg[NORMAL] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+ 	bg[SELECTED] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+ 	bg[ACTIVE] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+ 	bg[PRELIGHT] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
+
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+}
+
+style "mixer_mute_button" = "mute_button"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_mute_button_fullylit" = "mute_button_fullylit"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_mute_button_halflit" = "mute_button_halflit"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "multiline_combo" = "small_button"
+{
+	xthickness = 0
+	ythickness = 0
+}
+
+style "track_loop_button" = "small_button"
+{
+	bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	bg[PRELIGHT] = lighter(@@COLPREFIX@_somewhat_bright_indicator)
+
+}
+
+style "mixer_red_active_button" = "very_small_button"
+{
+	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
+
+ 	base[INSENSITIVE] = { 0.16, 0.16, 0.21 }
+ 	bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
+}
+
+style "time_button" = "default_button"
+{
+	font_name = "@FONT_SMALL@"
+}
+
+style "transport_button"
+{
+  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_contrasting_indicator,@@COLPREFIX@_bg)   #turns out this is kind of yucky looking, but it's there if you want to try it
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "transport_button_active"
+{
+	bg[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	bg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+	bg[PRELIGHT] = @@COLPREFIX@_contrasting_indicator
+
+	fg[NORMAL] = @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "transport_button_alternate_two"
+{
+	fg[SELECTED] = @@COLPREFIX@_darkest
+	fg[ACTIVE] =   @@COLPREFIX@_darkest
+	fg[PRELIGHT] = @@COLPREFIX@_darkest
+	fg[NORMAL] = @@COLPREFIX@_darkest
+
+	bg[NORMAL] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+	bg[ACTIVE] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+	bg[SELECTED] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+	bg[PRELIGHT] =   shade(0.2,@@COLPREFIX@_bright_indicator)
+}
+
+style "transport_rec_button"
+{
+	bg[ACTIVE] = darker(@@COLPREFIX@_arm)         #the rest of these don't quite do what I expected
+  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
+	#bg[SELECTED] = darker(@@COLPREFIX@_arm)
+	#bg[PRELIGHT] = lighter(mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
+  
+  fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "transport_rec_button_active"
+{
+	bg[ACTIVE] = darker(@@COLPREFIX@_arm)
+	bg[NORMAL] = darker(@@COLPREFIX@_arm)
+	bg[SELECTED] = darker(@@COLPREFIX@_arm)
+	bg[PRELIGHT] = darker(@@COLPREFIX@_arm)
+}
+
+style "transport_rec_button_alternate"
+{
+	bg[PRELIGHT] = @@COLPREFIX@_arm
+	bg[NORMAL] = @@COLPREFIX@_arm
+	bg[SELECTED] = @@COLPREFIX@_arm
+	bg[ACTIVE] = @@COLPREFIX@_arm
+}
+
+style "midi_channel_selector_button"
+{
+	bg[NORMAL] = @@COLPREFIX@_bg
+	bg[ACTIVE] = @@COLPREFIX@_midi_channel_selector
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+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 "menu_bar_base" = "default"
+{
+
+}
+*/
+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@_somewhat_bright_indicator
+   fg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
+   bg[ACTIVE]   = @@COLPREFIX@_base
+   bg[NORMAL]   = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
+   base[NORMAL] = @@COLPREFIX@_base
+}
+
+style "medium_entry" = "medium_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[SELECTED] = @@COLPREFIX@_fg_selected
+	
+	bg[NORMAL] = @@COLPREFIX@_bg
+	
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_bg_selected
+}
+
+style "medium_entry_noselection_fg" = "medium_entry"
+{
+	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+}
+
+style "medium_entry_noselection_bg" = "medium_entry"
+{
+	bg[SELECTED] = @@COLPREFIX@_text
+}
+
+style "medium_bold_entry"  = "medium_bold_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
+	
+	bg[NORMAL] = @@COLPREFIX@_bg
+	
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_base
+}
+
+style "small_entry" = "small_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+	text[SELECTED] = @@COLPREFIX@_fg_selected
+	bg[NORMAL] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
+	bg[SELECTED] = @@COLPREFIX@_base
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_base
+}
+
+style "red_active_small_entry" = "small_entry"
+{
+	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
+	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+}
+
+style "small_bold_entry" = "small_bold_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
+	
+	bg[NORMAL] = @@COLPREFIX@_bg
+	
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_base
+	base[SELECTED] = @@COLPREFIX@_base
+}
+
+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
+}
+
+#
+# Clocks: "text" is the clock digits; "base" is the bg
+#
+
+style "non_recording_big_clock_display" = "medium_entry"
+{
+	font_name = "@FONT_MASSIVE@"
+
+	text[NORMAL] = @@COLPREFIX@_control_text
+	text[ACTIVE] = @@COLPREFIX@_bright_indicator
+	text[SELECTED] = @@COLPREFIX@_bright_indicator
+	text[PRELIGHT] = @@COLPREFIX@_bright_indicator
+	text[INSENSITIVE] = @@COLPREFIX@_bright_indicator
+	
+	base[NORMAL] = @@COLPREFIX@_control_base
+	base[ACTIVE] = shade(0.5,@@COLPREFIX@_bright_indicator)
+}
+
+style "recording_big_clock_display" = "non_recording_big_clock_display"
+{
+	text[NORMAL] = darker(@@COLPREFIX@_arm)
+}
+
+style "transport_clock_display"
+{
+	font_name = "@FONT_BOLD_BIG@"
+
+        text[NORMAL] = darker (@@COLPREFIX@_contrasting_indicator)
+        text[ACTIVE] = darker (@@COLPREFIX@_bright_indicator)
+	text[SELECTED] = darker(@@COLPREFIX@_bright_indicator)
+	text[PRELIGHT] = darker(@@COLPREFIX@_bright_indicator)
+        text[INSENSITIVE] = darker(@@COLPREFIX@_bright_indicator)
+
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+	bg[NORMAL] = @@COLPREFIX@_darkest
+	bg[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "transport_clock_display_delta" = "transport_clock_display"
+{
+        text[NORMAL] = @@COLPREFIX@_bright_color
+}
+
+style "tempo_meter_clock_display" = "very_small_text"
+{
+	text[NORMAL] = @@COLPREFIX@_fg
+        text[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
+	text[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = @@COLPREFIX@_contrasting_indicator
+}
+
+style "default_clock_display" = "medium_text"
+{
+        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	text[ACTIVE] = @@COLPREFIX@_bright_indicator
+	text[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "selection_clock_display" 
+{
+        font_name = "@FONT_SMALLER@"
+
+        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	text[ACTIVE] = @@COLPREFIX@_bright_indicator
+	text[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "punch_clock_display" = "very_small_text"
+{
+        font_name = "@FONT_SMALLER@"
+
+        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
+	text[ACTIVE] = @@COLPREFIX@_bright_indicator
+	text[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "white_on_black_clock_display" = "medium_text"
+{
+	text[NORMAL] = @@COLPREFIX@_fg
+	text[ACTIVE] = @@COLPREFIX@_bright_indicator
+        base[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_darkest
+	base[ACTIVE] = @@COLPREFIX@_darkest
+}
+
+style "editor_time_ruler" = "small_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_fg
+	bg[NORMAL] = @@COLPREFIX@_base
+}
+
+style "audio_bus_base" = "very_small_text"
+{
+  fg[NORMAL] = @@COLPREFIX@_fg
+  bg[NORMAL] = @@COLPREFIX@_audio_bus
+}
+
+style "send_strip_base" = "default"
+{
+  font_name = "@FONT_SMALLER@"
+  fg[NORMAL] = @@COLPREFIX@_send_fg
+  bg[NORMAL] = @@COLPREFIX@_send_bg
+  bg[ACTIVE] = @@COLPREFIX@_send_bg
+  bg[PRELIGHT] = @@COLPREFIX@_send_bg
+  bg[INSENSITIVE] = @@COLPREFIX@_send_bg
+  bg[SELECTED] = @@COLPREFIX@_send_bg
+}
+
+style "audio_track_base" = "default"
+{
+  font_name = "@FONT_SMALLER@"
+  fg[NORMAL] = @@COLPREFIX@_fg
+  bg[NORMAL] = @@COLPREFIX@_audio_track
+  bg[ACTIVE] = @@COLPREFIX@_bg
+  bg[PRELIGHT] = @@COLPREFIX@_bg
+  bg[INSENSITIVE] = @@COLPREFIX@_bg
+  bg[SELECTED] = @@COLPREFIX@_bg
+}
+
+style "midi_track_base" = "default"
+{
+  font_name = "@FONT_SMALLER@"
+  fg[NORMAL] = @@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_metrics" = "audio_track_base"
+{
+	font_name = "@FONT_TINY@"
+}
+
+style "midi_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 "audio_bus_metrics_inactive" = "track_controls_inactive"
+{
+	font_name = "@FONT_TINY@"
+}
+
+style "track_name_display" = "medium_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_fg
+	fg[ACTIVE] = @@COLPREFIX@_fg
+
+	base[NORMAL] = @@COLPREFIX@_base
+	base[ACTIVE] = lighter(@@COLPREFIX@_base)
+	bg[NORMAL] = lighter(@@COLPREFIX@_base)
+	bg[ACTIVE] = lighter(@@COLPREFIX@_base)
+}
+
+style "active_track_name_display" = "medium_text"
+{
+	GtkWidget::cursor_color =  @@COLPREFIX@_base
+	text[NORMAL] = @@COLPREFIX@_base
+	base[NORMAL] = @@COLPREFIX@_text
+}
+
+style "track_separator"
+{
+	bg[NORMAL] = @@COLPREFIX@_fg
+}
+
+# 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@_base # 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)
+	bg[PRELIGHT] = shade (0.6, @@COLPREFIX@_lightest)
+
+	# the numeric display
+
+	text[NORMAL] = @@COLPREFIX@_text
+	text[ACTIVE] = @@COLPREFIX@_text
+	text[INSENSITIVE] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_text
+	text[PRELIGHT] = @@COLPREFIX@_text
+}
+
+style "track_list_display" = "small_bold_text"
+{
+ 	text[NORMAL] = @@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
+	GtkCheckButton::indicator-size = 10
+	GtkCheckButton::indicator-spacing = 0
+}
+
+# Colour of a processor frame when it is selected
+style "processor_frame_selected"
+{
+	bg[NORMAL] = @@COLPREFIX@_fg_selected
+}
+
+# Colour of a processor frame when it is a send whose level is being controller by the fader
+style "processor_frame_active_send"
+{
+	bg[NORMAL] = @@COLPREFIX@_send_fg
+}
+
+# Fader processor's background
+style "processor_fader"
+{
+	bg[NORMAL] = @@COLPREFIX@_processor_fader_bg
+}
+
+# Fader processor's frame
+style "processor_fader_frame" 
+{
+bg[NORMAL] = @@COLPREFIX@_processor_fader_frame
+}
+
+# Pre-fader processor's background
+style "processor_prefader"
+{
+	bg[NORMAL] = @@COLPREFIX@_processor_prefader
+}
+
+# Pre-fader processor's frame
+style "processor_prefader_frame"
+{
+	bg[NORMAL] = @@COLPREFIX@_processor_prefader_frame
+}
+
+# Post-fader processor's background
+style "processor_postfader"
+{
+	bg[NORMAL] = @@COLPREFIX@_processor_postfader
+}
+
+# Post-fader processor's frame
+style "processor_postfader_frame"
+{
+	bg[NORMAL] = @@COLPREFIX@_processor_postfader_frame
+}
+
+# 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_text"
+{
+	fg[NORMAL] = @@COLPREFIX@_text
+	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[SELECTED] = @@COLPREFIX@_text
+
+        bg[NORMAL] = @@COLPREFIX@_bright_indicator
+        bg[ACTIVE] = @@COLPREFIX@_bright_indicator
+        bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
+        bg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
+        bg[SELECTED] = @@COLPREFIX@_bright_indicator
+        base[NORMAL] = @@COLPREFIX@_bright_indicator
+        base[ACTIVE] = @@COLPREFIX@_bright_indicator
+        base[PRELIGHT] = @@COLPREFIX@_bright_indicator
+        base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
+        base[SELECTED] = @@COLPREFIX@_bright_indicator
+}
+
+style "selected_strip_frame"
+{
+	fg[NORMAL] = @@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 "green_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@_contrasting_indicator,darker(@@COLPREFIX@_bg))
+        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_contrasting_indicator,darker(@@COLPREFIX@_bg))
+
+	fg[ACTIVE] = @@COLPREFIX@_fg
+	bg[ACTIVE] = @@COLPREFIX@_contrasting_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 "location_rows_clock" = "default_clock_display"
+{
+	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
+}
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index dcde2d3ea1..b425c9980e 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -53,99 +53,6 @@ gtk_color_scheme = "@COLOR_SCHEME@"
 
 #alternate BG color: #5C5E61
 
-style "smallest_text"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "very_small_text"
-{
- 	font_name = "@FONT_SMALLER@"
-}
-
-style "small_text"
-{
- 	font_name = "@FONT_SMALL@"
-}
-
-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_BIGGER@"
-}
-
-style "larger_text"
-{
- 	font_name = "@FONT_LARGE@"
-}
-
-style "larger_bold_text"
-{
- 	font_name = "bold @FONT_LARGE@"
-}
-
-style "big_bold_text"
-{
-	font_name = "bold @FONT_LARGER@"
-}
-
-style "plugin_name_text" = "big_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-}
-
-style "plugin_maker_text" = "larger_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"
-{
-}
 
 style "default" = "medium_text"
 {
@@ -293,789 +200,6 @@ style "default" = "medium_text"
   }
 }
 
-style "contrasting_popup" = "medium_monospace_text"
-{
-  bg[NORMAL]          = @@COLPREFIX@_lightest
-  fg[NORMAL]          = @@COLPREFIX@_darkest
-  base[NORMAL]        = @@COLPREFIX@_lightest
-  text[NORMAL]        = @@COLPREFIX@_darkest
-  text[ACTIVE]        = @@COLPREFIX@_darkest
-  text[SELECTED]      = @@COLPREFIX@_darkest
-}
-
-style "base_frame"
-{
-	fg[NORMAL] = @@COLPREFIX@_bg
-	bg[NORMAL] = @@COLPREFIX@_bg
-}
-
-style "transport_base" = "medium_bold_text"
-{
-
-}
-
-style "default_button" = "small_text"
-{
-}
-
-style "mouse_mode_button" = "default_button"
-{
-        bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-        fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "default_menu" = "medium_text"
-{
-  #bg[NORMAL] = darker(@@COLPREFIX@_bg)
-}
-
-style "default_generic" = "medium_text"
-{
-}
-
-style "text_cell_entry" = "medium_text"
-{
-	GtkWidget::cursor_color =  @@COLPREFIX@_darkest
-}
-
-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 "punch_button" = "very_small_red_active_and_selected_button"
-{
- 	font_name = "@FONT_SMALLER@"
-
-	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 "gain_fader"
-{
-        bg[NORMAL] = shade (0.7, @@COLPREFIX@_lightest)
-	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_lightest)
-}
-
-#MSR and related buttons
-
-style "track_rec_enable_button" = "small_button"
-{
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-        bg[NORMAL] =   mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
-        bg[PRELIGHT] = shade(1.1,mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
-}
-
-style "track_rec_enable_button_active" = "small_button"
-{
-	#fg[ACTIVE] =   @@COLPREFIX@_darkest
-	#fg[SELECTED] = @@COLPREFIX@_darkest
-	#fg[PRELIGHT] = @@COLPREFIX@_darkest
-	#fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   @@COLPREFIX@_arm
-	bg[ACTIVE] =   @@COLPREFIX@_arm
-	bg[SELECTED] =   @@COLPREFIX@_arm
-	bg[PRELIGHT] =   shade(1.1, @@COLPREFIX@_arm)
-}
-
-style "track_rec_enable_button_alternate" = "small_button"
-{
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   lighter(@@COLPREFIX@_arm)
-	bg[ACTIVE] =   lighter(@@COLPREFIX@_arm)
-	bg[SELECTED] =   lighter(@@COLPREFIX@_arm)
-	bg[PRELIGHT] =   shade(1.1, lighter(@@COLPREFIX@_arm))
-}
-
-style "track_rec_enable_button_alternate_two" = "small_button"
-{
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   darker(@@COLPREFIX@_arm)
-	bg[ACTIVE] =   darker(@@COLPREFIX@_arm)
-	bg[SELECTED] =   darker(@@COLPREFIX@_arm)
-	bg[PRELIGHT] =   shade(1.1, darker(@@COLPREFIX@_arm))
-}
-
-style "mixer_track_rec_enable_button" = "track_rec_enable_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-
-style "solo_button" = "small_button"
-{
-  bg[NORMAL] = mix(0.1,@@COLPREFIX@_solo,@@COLPREFIX@_bg)
-  bg[ACTIVE] = @@COLPREFIX@_solo
-  fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "solo_isolate_led"
-{
-  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
-  fg[ACTIVE] = @@COLPREFIX@_isolate
-}
-
-style "solo_safe_led"
-{
-  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
-  fg[ACTIVE] = @@COLPREFIX@_isolate
-}
-
-style "solo_button_alternate" = "small_button"
-{
-        #
-        # this is the "solo-isolated" solo theme
-        #
-
-	bg[ACTIVE] = lighter(@@COLPREFIX@_solo)
-
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-	fg[NORMAL] = @@COLPREFIX@_bright_indicator
-	fg[PRELIGHT] = shade(1.1, @@COLPREFIX@_bright_indicator)
-}
-
-style "solo_button_alternate2" = "small_button"
-{
-        #
-        # this is the "half-bright" solo theme
-        #
-
-	bg[NORMAL] = darker(@@COLPREFIX@_solo) 
-	bg[ACTIVE] = darker(@@COLPREFIX@_solo)
-	bg[SELECTED] = darker(@@COLPREFIX@_solo)
-	bg[PRELIGHT] = shade(1.1, darker(@@COLPREFIX@_solo))
-
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "solo_button_active" = "small_button"
-{
-        #
-        # this is the "full-bright" solo theme
-        #
-
-	bg[NORMAL] = @@COLPREFIX@_solo
-	bg[ACTIVE] = @@COLPREFIX@_solo
-	bg[SELECTED] = @@COLPREFIX@_solo
-	bg[PRELIGHT] = shade(1.1, @@COLPREFIX@_solo)
-
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "mixer_invert_button" = "small_button"
-{
-	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "mixer_solo_button" = "solo_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_solo_button_alternate" = "solo_button_alternate"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_solo_button_alternate2" = "solo_button_alternate2"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-
-style "mixer_solo_button_active" = "solo_button_active"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "monitor_opt_button" = "small_button"
-{
-        bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
-	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_mono_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mono,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_mono
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_invert_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_mute_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_mute
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_dim_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,lighter(@@COLPREFIX@_mute),@@COLPREFIX@_bg)
-        bg[ACTIVE] = lighter(@@COLPREFIX@_mute)
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_iso_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_somewhat_bright_indicator,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "mute_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_mute
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "mute_button_fullylit" = "small_button"
-{
-        # this is the normal "active" state for a mute button
-
-	bg[ACTIVE] = @@COLPREFIX@_mute
-	bg[NORMAL] = @@COLPREFIX@_mute
-	bg[SELECTED] = @@COLPREFIX@_mute
-	bg[PRELIGHT] = lighter (@@COLPREFIX@_mute)
-
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "mute_button_halflit" = "small_button"
-{
- 	bg[NORMAL] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
- 	bg[SELECTED] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
- 	bg[ACTIVE] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
- 	bg[PRELIGHT] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
-
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "mixer_mute_button" = "mute_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_mute_button_fullylit" = "mute_button_fullylit"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_mute_button_halflit" = "mute_button_halflit"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "multiline_combo" = "small_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "track_loop_button" = "small_button"
-{
-	bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	bg[PRELIGHT] = lighter(@@COLPREFIX@_somewhat_bright_indicator)
-
-}
-
-style "mixer_red_active_button" = "very_small_button"
-{
-	bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-
- 	base[INSENSITIVE] = { 0.16, 0.16, 0.21 }
- 	bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
-}
-
-style "time_button" = "default_button"
-{
-	font_name = "@FONT_SMALL@"
-}
-
-style "transport_button"
-{
-  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_contrasting_indicator,@@COLPREFIX@_bg)   #turns out this is kind of yucky looking, but it's there if you want to try it
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_button_active"
-{
-	bg[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	bg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-	bg[PRELIGHT] = @@COLPREFIX@_contrasting_indicator
-
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_button_alternate_two"
-{
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-	bg[ACTIVE] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-	bg[SELECTED] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-	bg[PRELIGHT] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-}
-
-style "transport_rec_button"
-{
-	bg[ACTIVE] = darker(@@COLPREFIX@_arm)         #the rest of these don't quite do what I expected
-  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
-	#bg[SELECTED] = darker(@@COLPREFIX@_arm)
-	#bg[PRELIGHT] = lighter(mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
-  
-  fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_rec_button_active"
-{
-	bg[ACTIVE] = darker(@@COLPREFIX@_arm)
-	bg[NORMAL] = darker(@@COLPREFIX@_arm)
-	bg[SELECTED] = darker(@@COLPREFIX@_arm)
-	bg[PRELIGHT] = darker(@@COLPREFIX@_arm)
-}
-
-style "transport_rec_button_alternate"
-{
-	bg[PRELIGHT] = @@COLPREFIX@_arm
-	bg[NORMAL] = @@COLPREFIX@_arm
-	bg[SELECTED] = @@COLPREFIX@_arm
-	bg[ACTIVE] = @@COLPREFIX@_arm
-}
-
-style "midi_channel_selector_button"
-{
-	bg[NORMAL] = @@COLPREFIX@_bg
-	bg[ACTIVE] = @@COLPREFIX@_midi_channel_selector
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-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 "menu_bar_base" = "default"
-{
-
-}
-*/
-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@_somewhat_bright_indicator
-   fg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
-   bg[ACTIVE]   = @@COLPREFIX@_base
-   bg[NORMAL]   = @@COLPREFIX@_base
-   base[NORMAL] = @@COLPREFIX@_base
-   base[NORMAL] = @@COLPREFIX@_base
-}
-
-style "medium_entry" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	fg[SELECTED] = @@COLPREFIX@_fg_selected
-	
-	bg[NORMAL] = @@COLPREFIX@_bg
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_bg_selected
-}
-
-style "medium_entry_noselection_fg" = "medium_entry"
-{
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "medium_entry_noselection_bg" = "medium_entry"
-{
-	bg[SELECTED] = @@COLPREFIX@_text
-}
-
-style "medium_bold_entry"  = "medium_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	
-	bg[NORMAL] = @@COLPREFIX@_bg
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-style "small_entry" = "small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	text[SELECTED] = @@COLPREFIX@_fg_selected
-	bg[NORMAL] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-style "red_active_small_entry" = "small_entry"
-{
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
-style "small_bold_entry" = "small_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	
-	bg[NORMAL] = @@COLPREFIX@_bg
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-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
-}
-
-#
-# Clocks: "text" is the clock digits; "base" is the bg
-#
-
-style "non_recording_big_clock_display" = "medium_entry"
-{
-	font_name = "@FONT_MASSIVE@"
-
-	text[NORMAL] = @@COLPREFIX@_control_text
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	text[PRELIGHT] = @@COLPREFIX@_bright_indicator
-	text[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = shade(0.5,@@COLPREFIX@_bright_indicator)
-}
-
-style "recording_big_clock_display" = "non_recording_big_clock_display"
-{
-	text[NORMAL] = darker(@@COLPREFIX@_arm)
-}
-
-style "transport_clock_display"
-{
-	font_name = "@FONT_BOLD_BIG@"
-
-        text[NORMAL] = darker (@@COLPREFIX@_contrasting_indicator)
-        text[ACTIVE] = darker (@@COLPREFIX@_bright_indicator)
-	text[SELECTED] = darker(@@COLPREFIX@_bright_indicator)
-	text[PRELIGHT] = darker(@@COLPREFIX@_bright_indicator)
-        text[INSENSITIVE] = darker(@@COLPREFIX@_bright_indicator)
-
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-	bg[NORMAL] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_clock_display_delta" = "transport_clock_display"
-{
-        text[NORMAL] = @@COLPREFIX@_bright_color
-}
-
-style "tempo_meter_clock_display" = "very_small_text"
-{
-	text[NORMAL] = @@COLPREFIX@_fg
-        text[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "default_clock_display" = "medium_text"
-{
-        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "selection_clock_display" 
-{
-        font_name = "@FONT_SMALLER@"
-
-        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "punch_clock_display" = "very_small_text"
-{
-        font_name = "@FONT_SMALLER@"
-
-        text[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-	text[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "white_on_black_clock_display" = "medium_text"
-{
-	text[NORMAL] = @@COLPREFIX@_fg
-	text[ACTIVE] = @@COLPREFIX@_bright_indicator
-        base[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "editor_time_ruler" = "small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_base
-}
-
-style "audio_bus_base" = "very_small_text"
-{
-  fg[NORMAL] = @@COLPREFIX@_fg
-  bg[NORMAL] = @@COLPREFIX@_audio_bus
-}
-
-style "send_strip_base" = "default"
-{
-  font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @@COLPREFIX@_send_fg
-  bg[NORMAL] = @@COLPREFIX@_send_bg
-  bg[ACTIVE] = @@COLPREFIX@_send_bg
-  bg[PRELIGHT] = @@COLPREFIX@_send_bg
-  bg[INSENSITIVE] = @@COLPREFIX@_send_bg
-  bg[SELECTED] = @@COLPREFIX@_send_bg
-}
-
-style "audio_track_base" = "default"
-{
-  font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @@COLPREFIX@_fg
-  bg[NORMAL] = @@COLPREFIX@_audio_track
-  bg[ACTIVE] = @@COLPREFIX@_bg
-  bg[PRELIGHT] = @@COLPREFIX@_bg
-  bg[INSENSITIVE] = @@COLPREFIX@_bg
-  bg[SELECTED] = @@COLPREFIX@_bg
-}
-
-style "midi_track_base" = "default"
-{
-  font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @@COLPREFIX@_fg
-  bg[NORMAL] = @@COLPREFIX@_midi_track
-  bg[ACTIVE] = @@COLPREFIX@_bg
-  bg[PRELIGHT] = @@COLPREFIX@_bg
-  bg[INSENSITIVE] = @@COLPREFIX@_bg
-  bg[SELECTED] = @@COLPREFIX@_bg
-}
 
 style "track_controls_inactive" 
 {
@@ -1088,58 +212,6 @@ style "track_controls_inactive"
 	fg[NORMAL] = { 0.7, 0.8, 0.2 }	
 }
 
-style "audio_track_metrics" = "audio_track_base"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "midi_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 "audio_bus_metrics_inactive" = "track_controls_inactive"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "track_name_display" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_fg
-
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = lighter(@@COLPREFIX@_base)
-	bg[NORMAL] = lighter(@@COLPREFIX@_base)
-	bg[ACTIVE] = lighter(@@COLPREFIX@_base)
-}
-
-style "active_track_name_display" = "medium_text"
-{
-	GtkWidget::cursor_color =  @@COLPREFIX@_base
-	text[NORMAL] = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_text
-}
-
-style "track_separator"
-{
-	bg[NORMAL] = @@COLPREFIX@_fg
-}
 
 #
 # Track edit groups. These styles define
@@ -1264,647 +336,12 @@ style "automation_track_controls_base"
 	bg[PRELIGHT] = { 0.22, 0.22, 0.29 }
 }
 
-# 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@_base # 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)
-	bg[PRELIGHT] = shade (0.6, @@COLPREFIX@_lightest)
-
-	# the numeric display
-
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	text[INSENSITIVE] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_text
-	text[PRELIGHT] = @@COLPREFIX@_text
-}
-
-style "track_list_display" = "small_bold_text"
-{
- 	text[NORMAL] = @@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
-	GtkCheckButton::indicator-size = 10
-	GtkCheckButton::indicator-spacing = 0
-}
 
 style "inspector_processor_list" = "processor_list"
 {
  	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
-# Colour of a processor frame when it is selected
-style "processor_frame_selected"
-{
-	bg[NORMAL] = @@COLPREFIX@_fg_selected
-}
-
-# Colour of a processor frame when it is a send whose level is being controller by the fader
-style "processor_frame_active_send"
-{
-	bg[NORMAL] = @@COLPREFIX@_send_fg
-}
-
-# Fader processor's background
-style "processor_fader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_fader_bg
-}
-
-# Fader processor's frame
-style "processor_fader_frame" 
-{
-bg[NORMAL] = @@COLPREFIX@_processor_fader_frame
-}
-
-# Pre-fader processor's background
-style "processor_prefader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_prefader
-}
-
-# Pre-fader processor's frame
-style "processor_prefader_frame"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_prefader_frame
-}
-
-# Post-fader processor's background
-style "processor_postfader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_postfader
-}
-
-# Post-fader processor's frame
-style "processor_postfader_frame"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_postfader_frame
-}
-
-# 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_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	fg[SELECTED] = @@COLPREFIX@_text
-
-        bg[NORMAL] = @@COLPREFIX@_bright_indicator
-        bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-        bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
-        bg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-        bg[SELECTED] = @@COLPREFIX@_bright_indicator
-        base[NORMAL] = @@COLPREFIX@_bright_indicator
-        base[ACTIVE] = @@COLPREFIX@_bright_indicator
-        base[PRELIGHT] = @@COLPREFIX@_bright_indicator
-        base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-        base[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
-style "selected_strip_frame"
-{
-	fg[NORMAL] = @@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 "green_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@_contrasting_indicator,darker(@@COLPREFIX@_bg))
-        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_contrasting_indicator,darker(@@COLPREFIX@_bg))
-
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_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 "location_rows_clock" = "default_clock_display"
-{
-	font_name = "@FONT_NORMAL@"
-}
-
-style "ardour_button" ="default_button"
-{
-	xthickness = 1
-	ythickness = 1
-}
-
-style "padded_button" = "default_button"
-{
-	xthickness = 8
-}
-
-
-#---------------------------------------------------------------
-
-class "GtkWidget" style:highest "default"
-class "GtkScrollbar" style:highest "ardour_adjusters"
-class "GtkLabel" style:highest "default_generic"
-class "GtkButton" style:highest "ardour_button"
-class "GtkArrow" style:highest "tearoff_arrow"
-class "GtkProgressBar" style:highest "ardour_progressbars"
-
-widget "*PaddedButton" style:highest "padded_button"
-widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
-widget "*MarkerText" style:highest "marker_text"
-widget "*TimeAxisViewItemName*" style:highest "time_axis_view_item_name"
-widget "*EditModeSelector" style:highest "medium_bold_entry"
-widget "*SnapTypeSelector" style:highest "medium_bold_entry"
-widget "*SnapModeSelector" style:highest "medium_bold_entry"
-widget "*ZoomFocusSelector" style:highest "medium_bold_entry"
-widget "*ArdourContextMenu*" style:highest "default_menu"
-widget "*EditGroupTitleButton*" style:highest "default_button"
-widget "*MixerGroupTitleButton*" style:highest "default_button"
-widget "*ErrorLogCloseButton" style:highest "default_button"
-widget "*EditorGTKButton*" style:highest "default_button" 
-widget "*ToolbarButton" style:highest "default_button"
-widget "*ToolbarButton*" style:highest "default_button"
-widget "*CrossfadeEditButton" style:highest "default_button"
-widget "*CrossfadeEditButton*" style:highest "default_button"
-widget "*TrackHistoryButton*" style:highest "default_button"
-widget "*TrackSizeButton*" style:highest "default_button"
-widget "*TrackPlaylistButton*" style:highest "default_button"
-widget "*TrackAutomationButton*" style:highest "default_button"
-widget "*TrackGroupButton*" style:highest "default_button"
-widget "*TrackMixButton*" style:highest "default_button"
-widget "*TrackVisualButton*" style:highest "default_button"
-widget "*TrackRemoveButton*" style:highest "default_button"
-widget "*BaseButton" style:highest "default_button"
-widget "*TakeButtonLabel" style:highest "default_button"
-widget "*MixerWidthButton" style:highest "default_button"
-widget "*MixerHideButton" style:highest "default_button"
-widget "*MixerSendButton" style:highest "default_button"
-widget "*MixerSendButtonLabel" style:highest "default_button"
-widget "*MixerSendSwitch" style:highest "default_button"
-widget "*MixerInsertButton" style:highest "default_button"
-widget "*MixerInsertButtonLabel" style:highest "default_button"
-widget "*MixerInsertSwitch" style:highest "default_button"
-widget "*MixerMonitorInputButton*" style:highest "very_small_button"
-widget "*MixerMonitorInputButton.*" style:highest "very_small_button"
-widget "*MixerIOButton" style:highest "very_small_button"
-widget "*MixerIOButtonLabel" style:highest "very_small_button"
-widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
-widget "*AddRouteDialogRadioButton*" style:highest "preferences"
-widget "*OptionsNotebook" style:highest "preferences"
-widget "*OptionEditorToggleButton*" style:highest "preferences"
-widget "*OptionsLabel" style:highest "preferences"
-widget "*OptionEditorAuditionerLabel" style:highest "preferences"
-widget "*OptionsEntry" style:highest "option_entry"
-widget "*InspectorNotebook" style:highest "preferences"
-widget "*NewSessionDialog" style:highest "preferences"
-widget "*NewSessionDialogButton*" style:highest "preferences"
-widget "*MixerSendSwitch*" style:highest "very_small_red_active_and_selected_button"
-widget "*OptionEditorToggleButton" style:highest "small_red_active_and_selected_button"
-widget "*NewSessionDialogButton" style:highest "small_red_active_and_selected_button"
-widget "*RecordEnableButton" style:highest "track_rec_enable_button"
-widget "*RecordEnableButton-active" style:highest "track_rec_enable_button_active"
-widget "*RecordEnableButton-alternate" style:highest "track_rec_enable_button_alternate"
-widget "*RecordEnableButton-alternate2" style:highest "track_rec_enable_button_alternate_two"
-widget "*MixerRecordEnableButton" style:highest "mixer_track_rec_enable_button"
-widget "*MixerRecordEnableButton-active" style:highest "mixer_track_rec_enable_button_active"
-widget "*MixerRecordEnableButton-alternate" style:highest "mixer_track_rec_enable_button_alternate"
-widget "*MuteButton" style:highest "mute_button"
-widget "*MuteButton-alternate" style:highest "mute_button_fullylit"
-widget "*MuteButton-active" style:highest "mute_button_halflit"
-widget "*MixerMuteButton" style:highest "mixer_mute_button"
-widget "*MixerMuteButton-alternate" style:highest "mixer_mute_button_fullylit"
-widget "*MixerMuteButton-active" style:highest "mixer_mute_button_halflit"
-widget "*SoloButton" style:highest "solo_button"
-widget "*SoloButton-alternate" style:highest "solo_button_alternate"
-widget "*SoloButton-alternate2" style:highest "solo_button_alternate2"
-widget "*SoloButton-active" style:highest "solo_button_active"
-widget "*MixerSoloButton" style:highest "mixer_solo_button"
-widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate"
-widget "*MixerSoloButton-alternate2" style:highest "mixer_solo_button_alternate2"
-widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active"
-widget "*TrackLoopButton*" style:highest "track_loop_button"
-widget "*PanAutomationLineSelector*" style:highest "multiline_combo"
-widget "*EditorTimeButton*" style:highest "time_button"
-widget "*MixerInvertButton*" style:highest "mixer_invert_button"
-widget "*MixerInvertButton.*" style:highest "mixer_invert_button"
-widget "*MixerAutomationRecordingButton*" style:highest "very_small_button"
-widget "*MixerAutomationRecordingButton.*" style:highest "very_small_button"
-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 "*MixerNameButton" style:highest "very_small_button"
-widget "*MixerNameButtonLabel" style:highest "very_small_button"
-widget "*MixerGroupButton" style:highest "very_small_button"
-widget "*MixerGroupButtonLabel" style:highest "very_small_button"
-widget "*MixerCommentButton" style:highest "very_small_button"
-widget "*MixerCommentButton*" style:highest "very_small_button"
-widget "*MixerMonoButton*" style:highest "very_small_button"
-widget "*EditGroupButton" style:highest "very_small_button"
-widget "*EditGroupButtonLabel" style:highest "very_small_button"
-widget "*TransportButton" style:highest "transport_button"
-widget "*TransportButton-active" style:highest "transport_button_active"
-widget "*TransportButton-alternate2" style:highest "transport_button_alternate_two"
-widget "*TransportSyncButton" style:highest "transport_button"
-widget "*TransportSyncButton*" style:highest "transport_button"
-widget "*TransportSyncButton-active" style:highest "sync_alert"
-widget "*TransportSyncButton-active*" style:highest "sync_alert"
-widget "*ShuttleButton" style:highest "transport_button"
-widget "*ShuttleButton*" style:highest "transport_button"
-widget "*ShuttleDisplay" style:highest "transport_button"
-widget "*ShuttleDisplay*" style:highest "transport_button"
-widget "*ShuttleControl" style:highest "shuttle_control"
-widget "*TransportRecButton" style:highest "transport_rec_button"
-widget "*TransportRecButton*" style:highest "transport_rec_button"
-widget "*TransportRecButton-active" style:highest "transport_rec_button_active"
-widget "*TransportRecButton-active*" style:highest "transport_rec_button_active"
-widget "*TransportRecButton-alternate" style:highest "transport_rec_button_alternate"
-widget "*TransportRecButton-alternate*" style:highest "transport_rec_button_alternate"
-widget "*TransportRecButton*" style:highest "transport_rec_button"
-widget "*RecordingXrunWarningWindow" style:highest "xrun_warn"
-widget "*RecordingXrunWarningWindow*" style:highest "xrun_warn"
-#widget "*MainMenuBar" style:highest "menu_bar_base"
-widget "*ErrorMessage" style:highest "error_message"
-widget "*FatalMessage" style:highest "fatal_message"
-widget "*InfoMessage" style:highest "info_message"
-widget "*WarningMessage" style:highest "warning_message"
-widget "*BigClockNonRecording" style:highest "non_recording_big_clock_display"
-widget "*BigClockRecording" style:highest "recording_big_clock_display"
-widget "*SelectionClockDisplay" style:highest "selection_clock_display"
-widget "*PunchClockDisplay" style:highest "punch_clock_display"
-widget "*TransportClockDisplay" style:highest "transport_clock_display"
-widget "*SecondaryClockDisplay" style:highest "transport_clock_display"
-widget "*TransportClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*SecondaryClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*AudioClockFramesUpperInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockFramesLowerInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockSMPTEUpperInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockSMPTELowerInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockBBTUpperInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockBBTLowerInfo" style:highest "tempo_meter_clock_display"
-widget "*SelectionStartClock" style:highest "default_clock_display"
-widget "*SelectionEndClock" style:highest "default_clock_display"
-widget "*SilenceDurationClock" style:highest "white_on_black_clock_display"
-widget "*EditPointClock" style:highest "default_clock_display"
-widget "*PreRollClock" style:highest "default_clock_display"
-widget "*PostRollClock" style:highest "default_clock_display"
-widget "*NudgeClock" style:highest "default_clock_display"
-widget "*MenuBarClock" style:highest "default_clock_display"
-widget "*ZoomRangeClock" style:highest "default_clock_display"
-widget "*SMPTEOffsetClock" style:highest "default_clock_display"
-widget "*TransportLabel" style:highest "small_bold_text"
-widget "*TakeLabel" style:highest "small_bold_text"
-widget "*LocationLabel" style:highest "small_bold_text"
-widget "*WipeLabel" style:highest "small_bold_text"
-widget "*TakeTagLabel" style:highest "small_bold_text"
-widget "*ToolBarLabel" style:highest "small_bold_text"
-widget "*EditorDisplayLabel" style:highest "small_bold_text"
-widget "*NewSessionLabel" style:highest "larger_text"
-widget "*GlobalButtonLabel" style:highest "default_generic"
-widget "*ClickButton" style:highest "medium_entry"
-widget "*RegionNameDisplay" style:highest "medium_entry"
-widget "*PluginDisplay" style:highest "medium_entry"
-widget "*SelectionDisplay" style:highest "medium_entry"
-widget "*HistorySelector" style:highest "medium_entry"
-widget "*LocationSelector" style:highest "medium_entry"
-widget "*TakeSelector" style:highest "medium_entry"
-widget "*RegionSelector" style:highest "medium_entry"
-widget "*SMPTERuler" style:highest "editor_time_ruler"
-widget "*BBTRuler" style:highest "editor_time_ruler"
-widget "*SamplesRuler" style:highest "editor_time_ruler"
-widget "*TimecodeRuler" style:highest "editor_time_ruler"
-widget "*FramesRuler" style:highest "editor_time_ruler"
-widget "*MinSecRuler" style:highest "editor_time_ruler"
-widget "*BaseFrame" style:highest "base_frame"
-
-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 "*FaderMetricsStrip" style:highest "audio_track_metrics"
-widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
-widget "*MidiTrackMetrics" style:highest "midi_track_metrics"
-widget "*AudioBusMetrics" style:highest "audio_bus_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 "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
-widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
-widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
-widget "*AudioTrackFader" style:highest "gain_fader"
-
-widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
-widget "*AudioBusFader" style:highest "gain_fader"
-widget "*TrackSeparator" style:highest "track_separator"
-widget "*TrackEditIndicator0*" style:highest "edit_group_0"
-widget "*TrackEditIndicator1*" style:highest "edit_group_1"
-widget "*TrackEditIndicator2*" style:highest "edit_group_2"
-widget "*TrackEditIndicator3*" style:highest "edit_group_3"
-widget "*TrackEditIndicator4*" style:highest "edit_group_3"
-widget "*TrackEditIndicator5*" style:highest "edit_group_3"
-widget "*TrackEditIndicator6*" style:highest "edit_group_3"
-widget "*TrackEditIndicator7*" style:highest "edit_group_3"
-widget "*EditorTrackNameDisplay" style:highest "track_name_display"
-widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
-widget "*EditorActiveTrackNameDisplay" style:highest "active_track_name_display"
-widget "*EditorActiveTrackNameDisplay*" style:highest "active_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 "*CrossfadeEditLabel" style:highest "medium_text"
-widget "*CrossfadeEditFrame" style:highest "base_frame"
-widget "*MouseModeButton" style:highest "mouse_mode_button"
-widget "*MouseModeButton*" style:highest "default_button"
-widget "*EditorMainCanvas" style:highest "main_canvas_area"
-widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*BusControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*AutomationTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*AutomationTrackControlsBaseInactiveSelected" 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 "*ZoomClickBox" style:highest "medium_bold_entry"
-widget "*PluginParameterLabel" style:highest "medium_text"
-widget "*PluginNameInfo" style:highest "plugin_name_text"
-widget "*PluginMakerInfo" style:highest "plugin_maker_text"
-widget "*PluginParameterInfo" style:highest "medium_text"
-widget "*MotionControllerValue" style:highest "medium_entry"
-widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
-widget "*PluginSlider" style:highest "plugin_slider"
-widget "*EditGroupDisplay" style:highest "treeview_display"
-widget "*TrackListDisplay" style:highest "treeview_display"
-widget "*RegionListDisplay" style:highest "treeview_display"
-widget "*NamedSelectionDisplay" style:highest "treeview_display"
-widget "*SnapshotDisplay" style:highest "treeview_display"
-widget "*MixerTrackCommentArea" style:highest "option_entry"
-widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
-widget "*RegionEditorLabel" style:highest "medium_text"
-widget "*RegionEditorSmallLabel" style:highest "small_text"
-widget "*RegionEditorEntry" style:highest "medium_entry"
-widget "*RegionEditorClock" style:highest "default_clock_display"
-widget "*RegionEditorToggleButton" style:highest "paler_bright_when_active"
-widget "*RegionEditorToggleButton*" style:highest "paler_bright_when_active"
-widget "*MixerStripSpeedBase" style:highest "small_entry"
-widget "*MixerStripSpeedBase*" style:highest "small_entry"
-widget "*MixerStripSpeedBaseNotOne" style:highest "small_red_on_black_entry"
-widget "*MixerStripSpeedBaseNotOne*" style:highest "small_red_on_black_entry"
-widget "*MixerStripGainDisplay" style:highest "small_entry"
-widget "*MixerStripGainDisplay*" style:highest "small_entry"
-widget "*MixerStripGainUnitButton" style:highest "very_small_button"
-widget "*MixerStripGainUnitButton*" style:highest "very_small_button"
-widget "*MixerStripMeterPreButton" style:highest "very_small_button"
-widget "*MixerStripMeterPreButton*" style:highest "very_small_button"
-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 "*HWMonitorButton" style:highest "bright_when_active"
-widget "*HWMonitorButton*" style:highest "bright_when_active"
-widget "*MonitorInvertButton" style:highest "monitor_invert_button"
-widget "*MonitorInvertButton*" style:highest "monitor_invert_button"
-widget "*MonitorMuteButton" style:highest "monitor_mute_button"
-widget "*MonitorMuteButton*" style:highest "monitor_mute_button"
-widget "*MonitorDimButton" style:highest "monitor_dim_button"
-widget "*MonitorDimButton*" style:highest "monitor_dim_button"
-widget "*MonitorMonoButton" style:highest "monitor_mono_button"
-widget "*MonitorMonoButton*" style:highest "monitor_mono_button"
-widget "*MonitorInvertButton" style:highest "monitor_invert_button"
-widget "*MonitorInvertButton*" style:highest "monitor_invert_button"
-widget "*MonitorOptButton" style:highest "monitor_opt_button"
-widget "*MonitorOptButton*" style:highest "monitor_opt_button"
-widget "*MonitorIsoAlert" style:highest "monitor_iso_button"
-widget "*MonitorIsoAlert*" style:highest "monitor_iso_button"
-widget "*BypassButton" style:highest "bright_when_active"
-widget "*BypassButton*" style:highest "bright_when_active"
-widget "*TransportSoloAlert" style:highest "flashing_alert"
-widget "*TransportSoloAlert.*" style:highest "flashing_alert"
-widget "*TransportSoloAlert-active" style:highest "flashing_alert"
-widget "*TransportSoloAlert-alternate" style:highest "flashing_alert"
-widget "*SendAlert" style:highest "green_flashing_alert"
-widget "*SendAlert.*" style:highest "green_flashing_alert"
-widget "*TransportAuditioningAlert" style:highest "flashing_alert"
-widget "*TransportAuditioningAlert.*" style:highest "flashing_alert"
-widget "*FadeCurve" style:highest "medium_bold_entry"
-widget "*FadeCurve*" style:highest "medium_bold_entry"
-widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
-widget "*TearOffArrow" style:highest "tearoff_arrow"
-widget "*RouteParamsTitleButton" style:highest "medium_text"
-widget "*RouteParamsTitleLabel" style:highest "medium_text"
-widget "*PluginAutomateRecordButton" style:highest "small_red_active_and_selected_button"
-widget "*PluginAutomateRecordButton*" style:highest "small_red_active_and_selected_button"
-widget "*PluginAutomatePlayButton" style:highest "small_red_active_and_selected_button"
-widget "*PluginAutomatePlayButton*" style:highest "small_red_active_and_selected_button"
-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 "*PluginEditButton*" style:highest "small_button"
-widget "*PluginLoadButton" style:highest "small_button"
-widget "*PluginLoadButton*" style:highest "small_button"
-
-widget "*MetricDialogFrame" style:highest "base_frame"
-widget "*MetricEntry" style:highest "medium_bold_entry"
-widget "*MetricButton" style:highest "default_button"
-widget "*MetricButton.*" style:highest "default_button"
-widget "*MetricLabel" style:highest "medium_text"
-widget "*TimeStretchButton" style:highest "default_button"
-widget "*TimeStretchButton.*" style:highest "default_button"
-widget "*ChoiceWindow" style:highest "default_generic"
-widget "*ChoicePrompt" style:highest "default_generic"
-widget "*ChoiceButton" style:highest "default_button"
-widget "*ChoiceButton*" style:highest "default_button"
-widget "*SelectionModeButton" style:highest "default_button"
-widget "*SelectionModeButton*" style:highest "default_button"
-widget "*TrackLabel" style:highest "medium_text"
-widget "*TrackPlugName" style:highest "medium_text"
-widget "*TrackParameterName" style:highest "small_italic_text"
-widget "*AddRouteDialog*" style:highest "medium_text"
-widget "*AddRouteDialog.GtkLabel" style:highest "medium_text"
-widget "*AddRouteDialogChannelChoice" style:highest "medium_bold_entry"
-widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
-widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
-widget "*AddRouteDialogRadioButton" style:highest "bright_when_active"
-widget "*AddRouteDialogButton" style:highest "default_button"
-widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
-widget "*NewSessionIOLabel" style:highest "large_bold_text"
-widget "*NewSessionSR1Label" style:highest "red_medium_text"
-widget "*NewSessionSR2Label" style:highest "medium_text"
-widget "*NewSessionChannelChoice" style:highest "medium_bold_entry"
-widget "*NewSessionMainButton" style:highest "large_bold_text"
-widget "*NewSessionMainButton*" style:highest "large_bold_text"
-widget "*NewSessionMainLabel" style:highest "large_bold_text"
-widget "*LocationEditRowClock" style:highest "location_rows_clock"
-widget "*LocationEditNameLabel" style:highest "medium_text"
-widget "*LocationEditSetButton" style:highest "location_row_button"
-widget "*LocationEditSetButton*" style:highest "location_row_button"
-widget "*LocationEditGoButton" style:highest "location_row_button"
-widget "*LocationEditGoButton*" style:highest "location_row_button"
-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 "*LocationLocEditorFrame" style:highest "base_frame"
-widget "*LocationRangeEditorFrame" style:highest "base_frame"
-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 "*ChannelCountSelector.GtkArrow" style:highest "default_generic"
-widget "*RegionListWholeFile" style:highest "treeview_parent_node"
-widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
-widget "*MidiListView*" style:highest "treeview_display"
-widget "*ProcessorList*" style:highest "processor_list"
-widget "*ProcessorFrameSelected" style:highest "processor_frame_selected"
-widget "*ProcessorFrameActiveSend" style:highest "processor_frame_active_send"
-widget "*ProcessorFaderFrame" style:highest "processor_fader_frame"
-widget "*ProcessorPreFader" style:highest "processor_prefader"
-widget "*ProcessorPreFaderFrame" style:highest "processor_prefader_frame"
-widget "*ProcessorFader" style:highest "processor_fader"
-widget "*ProcessorPostFader" style:highest "processor_postfader"
-widget "*ProcessorPostFaderFrame" style:highest "processor_postfader_frame"
-widget "*PortMatrixLabel*" style:highest "small_text"
-widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
-widget "*SoloIsolatedLED" style:highest "solo_isolate_led"
-widget "*SoloSafeLED" style:highest "solo_safe_led"
-widget "*SoloLEDLabel" style:highest "very_small_text"
-widget "*ContrastingPopup" style:highest "contrasting_popup"
-widget "*ContrastingPopup*" style:highest "contrasting_popup"
-widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
-widget "*TimeInfoSelectionTitle" style:highest "very_small_bright_when_active"
-widget "*TimeInfoSelectionLabel" style:highest "very_small_bright_when_active"
-widget "*TimeInfoPunchTitle" style:highest "very_small_bright_when_active"
-widget "*TimeInfoPunchLabel" style:highest "very_small_bright_when_active"
-widget "*TimeInfoPunchButton" style:highest "punch_button"
-
-widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
-widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
-
-style "tooltip" = "medium_text"
-{
-        fg[NORMAL] = @@COLPREFIX@_fg_tooltip
-        bg[NORMAL] = @@COLPREFIX@_bg_tooltip
-}
-widget "gtk-tooltip*" style:highest "tooltip"
+include "ardour3_dark_fonts.rc"
+include "ardour3_dark_styles.rc"
+include "ardour3_widgets.rc"
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index f3bdcd4adc..fa9d0bda1f 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -25,6 +25,7 @@
 
 #@color arm #F33
 #@color solo #A8F730
+#@color midi_channel_selector #A8F730
 #@color isolate #B9ECF2
 #@color mute #FFFA87
 #@color mono #DEC
@@ -52,100 +53,6 @@ gtk_color_scheme = "@COLOR_SCHEME@"
 
 #alternate BG color: #5C5E61
 
-style "smallest_text"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "very_small_text"
-{
- 	font_name = "@FONT_SMALLER@"
-}
-
-style "small_text"
-{
- 	font_name = "@FONT_SMALL@"
-}
-
-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_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_BIGGER@"
-}
-
-style "larger_text"
-{
- 	font_name = "@FONT_LARGE@"
-}
-
-style "larger_bold_text"
-{
- 	font_name = "bold @FONT_LARGE@"
-}
-
-style "big_bold_text"
-{
-	font_name = "bold @FONT_LARGER@"
-}
-
-style "plugin_name_text" = "big_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-}
-
-style "plugin_maker_text" = "larger_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"
-{
-}
-
 style "default" = "medium_text"
 {
   #Original values for reference
@@ -292,353 +199,6 @@ style "default" = "medium_text"
   }
 }
 
-style "contrasting_popup" = "medium_monospace_text"
-{
-  bg[NORMAL]          = @@COLPREFIX@_lightest
-  fg[NORMAL]          = @@COLPREFIX@_darkest
-  base[NORMAL]        = @@COLPREFIX@_lightest
-  text[NORMAL]        = @@COLPREFIX@_darkest
-  text[ACTIVE]        = @@COLPREFIX@_darkest
-  text[SELECTED]      = @@COLPREFIX@_darkest
-}
-
-style "base_frame"
-{
-	fg[NORMAL] = @@COLPREFIX@_bg
-	bg[NORMAL] = @@COLPREFIX@_bg
-}
-
-style "transport_base" = "medium_bold_text"
-{
-
-}
-
-style "default_button" = "small_text"
-{
-}
-
-style "mouse_mode_button" = "default_button"
-{
-        bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-        fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "default_menu" = "medium_text"
-{
-  #bg[NORMAL] = darker(@@COLPREFIX@_bg)
-}
-
-style "default_generic" = "medium_text"
-{
-}
-
-style "text_cell_entry" = "medium_text"
-{
-	GtkWidget::cursor_color =  @@COLPREFIX@_darkest
-}
-
-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 "gain_fader"
-{
-        bg[NORMAL] = shade (0.7, @@COLPREFIX@_lightest)
-	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_lightest)
-}
-
-#MSR and related buttons
-
-style "track_rec_enable_button" = "small_button"
-{
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-        bg[NORMAL] =   mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
-        bg[PRELIGHT] = shade(1.1,mix(0.08,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
-}
-
-style "track_rec_enable_button_active" = "small_button"
-{
-	#fg[ACTIVE] =   @@COLPREFIX@_darkest
-	#fg[SELECTED] = @@COLPREFIX@_darkest
-	#fg[PRELIGHT] = @@COLPREFIX@_darkest
-	#fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   @@COLPREFIX@_arm
-	bg[ACTIVE] =   @@COLPREFIX@_arm
-	bg[SELECTED] =   @@COLPREFIX@_arm
-	bg[PRELIGHT] =   shade(1.1, @@COLPREFIX@_arm)
-}
-
-style "track_rec_enable_button_alternate" = "small_button"
-{
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   lighter(@@COLPREFIX@_arm)
-	bg[ACTIVE] =   lighter(@@COLPREFIX@_arm)
-	bg[SELECTED] =   lighter(@@COLPREFIX@_arm)
-	bg[PRELIGHT] =   shade(1.1, lighter(@@COLPREFIX@_arm))
-}
-
-style "track_rec_enable_button_alternate_two" = "small_button"
-{
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   darker(@@COLPREFIX@_arm)
-	bg[ACTIVE] =   darker(@@COLPREFIX@_arm)
-	bg[SELECTED] =   darker(@@COLPREFIX@_arm)
-	bg[PRELIGHT] =   shade(1.1, darker(@@COLPREFIX@_arm))
-}
-
-style "mixer_track_rec_enable_button" = "track_rec_enable_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-
-style "solo_button" = "small_button"
-{
-  bg[NORMAL] = mix(0.1,@@COLPREFIX@_solo,@@COLPREFIX@_bg)
-  bg[ACTIVE] = @@COLPREFIX@_solo
-  fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "solo_isolate_led"
-{
-  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
-  fg[ACTIVE] = @@COLPREFIX@_isolate
-}
-
-style "solo_safe_led"
-{
-  fg[NORMAL] = mix(0.2,@@COLPREFIX@_isolate, @@COLPREFIX@_darkest)
-  fg[ACTIVE] = @@COLPREFIX@_isolate
-}
-
-style "solo_button_alternate" = "small_button"
-{
-        #
-        # this is the "solo-isolated" solo theme
-        #
-
-	bg[ACTIVE] = lighter(@@COLPREFIX@_solo)
-
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-	fg[NORMAL] = @@COLPREFIX@_bright_indicator
-	fg[PRELIGHT] = shade(1.1, @@COLPREFIX@_bright_indicator)
-}
-
-style "solo_button_alternate2" = "small_button"
-{
-        #
-        # this is the "half-bright" solo theme
-        #
-
-	bg[NORMAL] = darker(@@COLPREFIX@_solo) 
-	bg[ACTIVE] = darker(@@COLPREFIX@_solo)
-	bg[SELECTED] = darker(@@COLPREFIX@_solo)
-	bg[PRELIGHT] = shade(1.1, darker(@@COLPREFIX@_solo))
-
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "solo_button_active" = "small_button"
-{
-        #
-        # this is the "full-bright" solo theme
-        #
-
-	bg[NORMAL] = @@COLPREFIX@_solo
-	bg[ACTIVE] = @@COLPREFIX@_solo
-	bg[SELECTED] = @@COLPREFIX@_solo
-	bg[PRELIGHT] = shade(1.1, @@COLPREFIX@_solo)
-
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "mixer_invert_button" = "small_button"
-{
-	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "mixer_solo_button" = "solo_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_solo_button_alternate" = "solo_button_alternate"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_solo_button_alternate2" = "solo_button_alternate2"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-
-style "mixer_solo_button_active" = "solo_button_active"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "monitor_opt_button" = "small_button"
-{
-        bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
-	bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_mono_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mono,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_mono
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_invert_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_not_so_bright_indicator,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_not_so_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_mute_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_mute
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_dim_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,lighter(@@COLPREFIX@_mute),@@COLPREFIX@_bg)
-        bg[ACTIVE] = lighter(@@COLPREFIX@_mute)
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "monitor_iso_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_somewhat_bright_indicator,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "mute_button" = "small_button"
-{
-	bg[NORMAL] = mix(0.1,@@COLPREFIX@_mute,@@COLPREFIX@_bg)
-        bg[ACTIVE] = @@COLPREFIX@_mute
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "mute_button_fullylit" = "small_button"
-{
-        # this is the normal "active" state for a mute button
-
-	bg[ACTIVE] = @@COLPREFIX@_mute
-	bg[NORMAL] = @@COLPREFIX@_mute
-	bg[SELECTED] = @@COLPREFIX@_mute
-	bg[PRELIGHT] = lighter (@@COLPREFIX@_mute)
-
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "mute_button_halflit" = "small_button"
-{
- 	bg[NORMAL] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
- 	bg[SELECTED] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
- 	bg[ACTIVE] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
- 	bg[PRELIGHT] = mix(0.5,@@COLPREFIX@_lightest,@@COLPREFIX@_mute)
-
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-}
-
-style "mixer_mute_button" = "mute_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_mute_button_fullylit" = "mute_button_fullylit"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "mixer_mute_button_halflit" = "mute_button_halflit"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "multiline_combo" = "small_button"
-{
-	xthickness = 0
-	ythickness = 0
-}
-
-style "track_loop_button" = "small_button"
-{
-	bg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	bg[PRELIGHT] = lighter(@@COLPREFIX@_somewhat_bright_indicator)
-
-}
 
 style "mixer_red_active_button" = "very_small_button"
 {
@@ -648,388 +208,6 @@ style "mixer_red_active_button" = "very_small_button"
  	bg[INSENSITIVE] = { 0.16, 0.16, 0.21 }
 }
 
-style "time_button" = "default_button"
-{
-	font_name = "@FONT_SMALL@"
-}
-
-style "transport_button"
-{
-  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_contrasting_indicator,@@COLPREFIX@_bg)   #turns out this is kind of yucky looking, but it's there if you want to try it
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_button_active"
-{
-	bg[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	bg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-	bg[PRELIGHT] = @@COLPREFIX@_contrasting_indicator
-
-	fg[NORMAL] = @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_button_alternate_two"
-{
-	fg[SELECTED] = @@COLPREFIX@_darkest
-	fg[ACTIVE] =   @@COLPREFIX@_darkest
-	fg[PRELIGHT] = @@COLPREFIX@_darkest
-	fg[NORMAL] = @@COLPREFIX@_darkest
-
-	bg[NORMAL] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-	bg[ACTIVE] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-	bg[SELECTED] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-	bg[PRELIGHT] =   shade(0.2,@@COLPREFIX@_bright_indicator)
-}
-
-style "transport_rec_button"
-{
-	bg[ACTIVE] = darker(@@COLPREFIX@_arm)         #the rest of these don't quite do what I expected
-  #bg[NORMAL] = mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg)
-	#bg[SELECTED] = darker(@@COLPREFIX@_arm)
-	#bg[PRELIGHT] = lighter(mix(0.05,@@COLPREFIX@_arm,@@COLPREFIX@_bg))
-  
-  fg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_rec_button_active"
-{
-	bg[ACTIVE] = darker(@@COLPREFIX@_arm)
-	bg[NORMAL] = darker(@@COLPREFIX@_arm)
-	bg[SELECTED] = darker(@@COLPREFIX@_arm)
-	bg[PRELIGHT] = darker(@@COLPREFIX@_arm)
-}
-
-style "transport_rec_button_alternate"
-{
-	bg[PRELIGHT] = @@COLPREFIX@_arm
-	bg[NORMAL] = @@COLPREFIX@_arm
-	bg[SELECTED] = @@COLPREFIX@_arm
-	bg[ACTIVE] = @@COLPREFIX@_arm
-}
-
-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 "red_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 "menu_bar_base" = "default"
-{
-
-}
-*/
-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@_somewhat_bright_indicator
-   fg[NORMAL] = @@COLPREFIX@_somewhat_bright_indicator
-   bg[ACTIVE]   = @@COLPREFIX@_base
-   bg[NORMAL]   = @@COLPREFIX@_base
-   base[NORMAL] = @@COLPREFIX@_base
-   base[NORMAL] = @@COLPREFIX@_base
-}
-
-style "medium_entry" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	fg[SELECTED] = @@COLPREFIX@_fg_selected
-	
-	bg[NORMAL] = @@COLPREFIX@_bg
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_bg_selected
-}
-
-style "medium_entry_noselection_fg" = "medium_entry"
-{
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "medium_entry_noselection_bg" = "medium_entry"
-{
-	bg[SELECTED] = @@COLPREFIX@_text
-}
-
-style "medium_bold_entry"  = "medium_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	
-	bg[NORMAL] = @@COLPREFIX@_bg
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-style "small_entry" = "small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	fg[SELECTED] = @@COLPREFIX@_contrasting_indicator
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	text[SELECTED] = @@COLPREFIX@_fg_selected
-	bg[NORMAL] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-style "red_active_small_entry" = "small_entry"
-{
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
-style "small_bold_entry" = "small_bold_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	
-	bg[NORMAL] = @@COLPREFIX@_bg
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	base[SELECTED] = @@COLPREFIX@_base
-}
-
-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 "non_recording_big_clock_display" = "medium_entry"
-{
-	font_name = "@FONT_MASSIVE@"
-
-	fg[NORMAL] = @@COLPREFIX@_control_text
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-	fg[PRELIGHT] = @@COLPREFIX@_bright_indicator
-	fg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-	
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_base
-	bg[NORMAL] = @@COLPREFIX@_base
-	bg[ACTIVE] = shade(0.5,@@COLPREFIX@_bright_indicator)
-}
-
-style "recording_big_clock_display" = "non_recording_big_clock_display"
-{
-	fg[NORMAL] = darker(@@COLPREFIX@_arm)
-}
-
-style "transport_clock_display"
-{
-	font_name = "@FONT_BOLD_BIGGER@"
-
-	fg[NORMAL] = darker (@@COLPREFIX@_contrasting_indicator)
-	fg[ACTIVE] = darker(@@COLPREFIX@_bright_indicator)
-	fg[SELECTED] = darker(@@COLPREFIX@_bright_indicator)
-	fg[PRELIGHT] = darker(@@COLPREFIX@_bright_indicator)
-	fg[INSENSITIVE] = darker(@@COLPREFIX@_bright_indicator)
-
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-	bg[NORMAL] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "transport_clock_display_delta" = "transport_clock_display"
-{
-	fg[NORMAL] = @@COLPREFIX@_bright_color
-}
-
-style "tempo_meter_clock_display" = "very_small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_somewhat_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-	bg[NORMAL] = @@COLPREFIX@_bright_color
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
-}
-
-style "default_clock_display" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_contrasting_indicator
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-	bg[NORMAL] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-
-style "white_on_black_clock_display" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
-	base[NORMAL] = @@COLPREFIX@_darkest
-	base[ACTIVE] = @@COLPREFIX@_darkest
-	bg[NORMAL] = @@COLPREFIX@_darkest
-	bg[ACTIVE] = @@COLPREFIX@_darkest
-}
-
-style "editor_time_ruler" = "small_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_base
-}
-
-style "audio_bus_base" = "very_small_text"
-{
-  fg[NORMAL] = @@COLPREFIX@_fg
-  bg[NORMAL] = @@COLPREFIX@_audio_bus
-}
-
-style "send_strip_base" = "default"
-{
-  font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @@COLPREFIX@_send_fg
-  bg[NORMAL] = @@COLPREFIX@_send_bg
-  bg[ACTIVE] = @@COLPREFIX@_send_bg
-  bg[PRELIGHT] = @@COLPREFIX@_send_bg
-  bg[INSENSITIVE] = @@COLPREFIX@_send_bg
-  bg[SELECTED] = @@COLPREFIX@_send_bg
-}
-
-style "audio_track_base" = "default"
-{
-  font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @@COLPREFIX@_fg
-  bg[NORMAL] = @@COLPREFIX@_audio_track
-  bg[ACTIVE] = @@COLPREFIX@_bg
-  bg[PRELIGHT] = @@COLPREFIX@_bg
-  bg[INSENSITIVE] = @@COLPREFIX@_bg
-  bg[SELECTED] = @@COLPREFIX@_bg
-}
-
-style "midi_track_base" = "default"
-{
-  font_name = "@FONT_SMALLER@"
-  fg[NORMAL] = @@COLPREFIX@_fg
-  bg[NORMAL] = @@COLPREFIX@_midi_track
-  bg[ACTIVE] = @@COLPREFIX@_bg
-  bg[PRELIGHT] = @@COLPREFIX@_bg
-  bg[INSENSITIVE] = @@COLPREFIX@_bg
-  bg[SELECTED] = @@COLPREFIX@_bg
-}
 
 style "track_controls_inactive" 
 {
@@ -1042,48 +220,6 @@ style "track_controls_inactive"
 	fg[NORMAL] = { 0.7, 0.8, 0.2 }	
 }
 
-style "audio_track_metrics" = "audio_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 "audio_bus_metrics_inactive" = "track_controls_inactive"
-{
-	font_name = "@FONT_TINY@"
-}
-
-style "track_name_display" = "medium_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_fg
-	fg[ACTIVE] = @@COLPREFIX@_fg
-
-	base[NORMAL] = @@COLPREFIX@_base
-	base[ACTIVE] = lighter(@@COLPREFIX@_base)
-	bg[NORMAL] = lighter(@@COLPREFIX@_base)
-	bg[ACTIVE] = lighter(@@COLPREFIX@_base)
-}
-
-style "active_track_name_display" = "medium_text"
-{
-	GtkWidget::cursor_color =  @@COLPREFIX@_base
-	text[NORMAL] = @@COLPREFIX@_base
-	base[NORMAL] = @@COLPREFIX@_text
-}
-
-style "track_separator"
-{
-	bg[NORMAL] = @@COLPREFIX@_fg
-}
 
 #
 # Track edit groups. These styles define
@@ -1192,7 +328,7 @@ style "track_controls_inactive" = "larger_text"
 
 style "edit_controls_base_selected"
 {
-	bg[NORMAL] = { 0.32, 0.32, 0.54 }
+ 	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 }
@@ -1208,636 +344,12 @@ style "automation_track_controls_base"
 	bg[PRELIGHT] = { 0.22, 0.22, 0.29 }
 }
 
-# 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@_base # 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)
-	bg[PRELIGHT] = shade (0.6, @@COLPREFIX@_lightest)
-
-	# the numeric display
-
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
-	text[INSENSITIVE] = @@COLPREFIX@_text
-	text[SELECTED] = @@COLPREFIX@_text
-	text[PRELIGHT] = @@COLPREFIX@_text
-}
-
-style "track_list_display" = "small_bold_text"
-{
- 	text[NORMAL] = @@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
-	GtkCheckButton::indicator-size = 10
-	GtkCheckButton::indicator-spacing = 0
-}
 
 style "inspector_processor_list" = "processor_list"
 {
  	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
-# Colour of a processor frame when it is selected
-style "processor_frame_selected"
-{
-	bg[NORMAL] = @@COLPREFIX@_fg_selected
-}
-
-# Colour of a processor frame when it is a send whose level is being controller by the fader
-style "processor_frame_active_send"
-{
-	bg[NORMAL] = @@COLPREFIX@_send_fg
-}
-
-# Fader processor's background
-style "processor_fader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_fader_bg
-}
-
-# Fader processor's frame
-style "processor_fader_frame" 
-{
-bg[NORMAL] = @@COLPREFIX@_processor_fader_frame
-}
-
-# Pre-fader processor's background
-style "processor_prefader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_prefader
-}
-
-# Pre-fader processor's frame
-style "processor_prefader_frame"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_prefader_frame
-}
-
-# Post-fader processor's background
-style "processor_postfader"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_postfader
-}
-
-# Post-fader processor's frame
-style "processor_postfader_frame"
-{
-	bg[NORMAL] = @@COLPREFIX@_processor_postfader_frame
-}
-
-# 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_red_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_text"
-{
-	fg[NORMAL] = @@COLPREFIX@_text
-	fg[ACTIVE] = @@COLPREFIX@_text
-	fg[SELECTED] = @@COLPREFIX@_text
-
-        bg[NORMAL] = @@COLPREFIX@_bright_indicator
-        bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-        bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
-        bg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-        bg[SELECTED] = @@COLPREFIX@_bright_indicator
-        base[NORMAL] = @@COLPREFIX@_bright_indicator
-        base[ACTIVE] = @@COLPREFIX@_bright_indicator
-        base[PRELIGHT] = @@COLPREFIX@_bright_indicator
-        base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-        base[SELECTED] = @@COLPREFIX@_bright_indicator
-}
-
-style "selected_strip_frame"
-{
-	fg[NORMAL] = @@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 "green_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@_contrasting_indicator,darker(@@COLPREFIX@_bg))
-        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_contrasting_indicator,darker(@@COLPREFIX@_bg))
-
-	fg[ACTIVE] = @@COLPREFIX@_fg
-	bg[ACTIVE] = @@COLPREFIX@_contrasting_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 "location_rows_clock" = "default_clock_display"
-{
-	font_name = "@FONT_NORMAL@"
-}
-
-style "ardour_button" ="default_button"
-{
-	xthickness = 1
-	ythickness = 1
-}
-
-style "padded_button" = "default_button"
-{
-	xthickness = 8
-}
-
-
-#---------------------------------------------------------------
-
-class "GtkWidget" style:highest "default"
-class "GtkScrollbar" style:highest "ardour_adjusters"
-class "GtkLabel" style:highest "default_generic"
-class "GtkButton" style:highest "ardour_button"
-class "GtkArrow" style:highest "tearoff_arrow"
-class "GtkProgressBar" style:highest "ardour_progressbars"
-
-widget "*PaddedButton" style:highest "padded_button"
-widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
-widget "*MarkerText" style:highest "marker_text"
-widget "*TimeAxisViewItemName*" style:highest "time_axis_view_item_name"
-widget "*EditModeSelector" style:highest "medium_bold_entry"
-widget "*SnapTypeSelector" style:highest "medium_bold_entry"
-widget "*SnapModeSelector" style:highest "medium_bold_entry"
-widget "*ZoomFocusSelector" style:highest "medium_bold_entry"
-widget "*ArdourContextMenu*" style:highest "default_menu"
-widget "*EditGroupTitleButton*" style:highest "default_button"
-widget "*MixerGroupTitleButton*" style:highest "default_button"
-widget "*ErrorLogCloseButton" style:highest "default_button"
-widget "*EditorGTKButton*" style:highest "default_button" 
-widget "*ToolbarButton" style:highest "default_button"
-widget "*ToolbarButton*" style:highest "default_button"
-widget "*CrossfadeEditButton" style:highest "default_button"
-widget "*CrossfadeEditButton*" style:highest "default_button"
-widget "*TrackHistoryButton*" style:highest "default_button"
-widget "*TrackSizeButton*" style:highest "default_button"
-widget "*TrackPlaylistButton*" style:highest "default_button"
-widget "*TrackAutomationButton*" style:highest "default_button"
-widget "*TrackGroupButton*" style:highest "default_button"
-widget "*TrackMixButton*" style:highest "default_button"
-widget "*TrackVisualButton*" style:highest "default_button"
-widget "*TrackRemoveButton*" style:highest "default_button"
-widget "*BaseButton" style:highest "default_button"
-widget "*TakeButtonLabel" style:highest "default_button"
-widget "*MixerWidthButton" style:highest "default_button"
-widget "*MixerHideButton" style:highest "default_button"
-widget "*MixerSendButton" style:highest "default_button"
-widget "*MixerSendButtonLabel" style:highest "default_button"
-widget "*MixerSendSwitch" style:highest "default_button"
-widget "*MixerInsertButton" style:highest "default_button"
-widget "*MixerInsertButtonLabel" style:highest "default_button"
-widget "*MixerInsertSwitch" style:highest "default_button"
-widget "*MixerMonitorInputButton*" style:highest "very_small_button"
-widget "*MixerMonitorInputButton.*" style:highest "very_small_button"
-widget "*MixerIOButton" style:highest "very_small_button"
-widget "*MixerIOButtonLabel" style:highest "very_small_button"
-widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
-widget "*AddRouteDialogRadioButton*" style:highest "preferences"
-widget "*OptionsNotebook" style:highest "preferences"
-widget "*OptionEditorToggleButton*" style:highest "preferences"
-widget "*OptionsLabel" style:highest "preferences"
-widget "*OptionEditorAuditionerLabel" style:highest "preferences"
-widget "*OptionsEntry" style:highest "option_entry"
-widget "*InspectorNotebook" style:highest "preferences"
-widget "*NewSessionDialog" style:highest "preferences"
-widget "*NewSessionDialogButton*" style:highest "preferences"
-widget "*MixerSendSwitch*" style:highest "very_small_red_active_and_selected_button"
-widget "*OptionEditorToggleButton" style:highest "small_red_active_and_selected_button"
-widget "*NewSessionDialogButton" style:highest "small_red_active_and_selected_button"
-widget "*RecordEnableButton" style:highest "track_rec_enable_button"
-widget "*RecordEnableButton-active" style:highest "track_rec_enable_button_active"
-widget "*RecordEnableButton-alternate" style:highest "track_rec_enable_button_alternate"
-widget "*RecordEnableButton-alternate2" style:highest "track_rec_enable_button_alternate_two"
-widget "*MixerRecordEnableButton" style:highest "mixer_track_rec_enable_button"
-widget "*MixerRecordEnableButton-active" style:highest "mixer_track_rec_enable_button_active"
-widget "*MixerRecordEnableButton-alternate" style:highest "mixer_track_rec_enable_button_alternate"
-widget "*MuteButton" style:highest "mute_button"
-widget "*MuteButton-alternate" style:highest "mute_button_fullylit"
-widget "*MuteButton-active" style:highest "mute_button_halflit"
-widget "*MixerMuteButton" style:highest "mixer_mute_button"
-widget "*MixerMuteButton-alternate" style:highest "mixer_mute_button_fullylit"
-widget "*MixerMuteButton-active" style:highest "mixer_mute_button_halflit"
-widget "*SoloButton" style:highest "solo_button"
-widget "*SoloButton-alternate" style:highest "solo_button_alternate"
-widget "*SoloButton-alternate2" style:highest "solo_button_alternate2"
-widget "*SoloButton-active" style:highest "solo_button_active"
-widget "*MixerSoloButton" style:highest "mixer_solo_button"
-widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate"
-widget "*MixerSoloButton-alternate2" style:highest "mixer_solo_button_alternate2"
-widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active"
-widget "*TrackLoopButton*" style:highest "track_loop_button"
-widget "*PanAutomationLineSelector*" style:highest "multiline_combo"
-widget "*EditorTimeButton*" style:highest "time_button"
-widget "*MixerInvertButton*" style:highest "mixer_invert_button"
-widget "*MixerInvertButton.*" style:highest "mixer_invert_button"
-widget "*MixerAutomationRecordingButton*" style:highest "very_small_button"
-widget "*MixerAutomationRecordingButton.*" style:highest "very_small_button"
-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 "*MixerNameButton" style:highest "very_small_button"
-widget "*MixerNameButtonLabel" style:highest "very_small_button"
-widget "*MixerGroupButton" style:highest "very_small_button"
-widget "*MixerGroupButtonLabel" style:highest "very_small_button"
-widget "*MixerCommentButton" style:highest "very_small_button"
-widget "*MixerCommentButton*" style:highest "very_small_button"
-widget "*MixerMonoButton*" style:highest "very_small_button"
-widget "*EditGroupButton" style:highest "very_small_button"
-widget "*EditGroupButtonLabel" style:highest "very_small_button"
-widget "*TransportButton" style:highest "transport_button"
-widget "*TransportButton-active" style:highest "transport_button_active"
-widget "*TransportButton-alternate2" style:highest "transport_button_alternate_two"
-widget "*TransportSyncButton" style:highest "transport_button"
-widget "*TransportSyncButton*" style:highest "transport_button"
-widget "*TransportSyncButton-active" style:highest "sync_alert"
-widget "*TransportSyncButton-active*" style:highest "sync_alert"
-widget "*ShuttleButton" style:highest "transport_button"
-widget "*ShuttleButton*" style:highest "transport_button"
-widget "*ShuttleDisplay" style:highest "transport_button"
-widget "*ShuttleDisplay*" style:highest "transport_button"
-widget "*ShuttleControl" style:highest "shuttle_control"
-widget "*TransportRecButton" style:highest "transport_rec_button"
-widget "*TransportRecButton*" style:highest "transport_rec_button"
-widget "*TransportRecButton-active" style:highest "transport_rec_button_active"
-widget "*TransportRecButton-active*" style:highest "transport_rec_button_active"
-widget "*TransportRecButton-alternate" style:highest "transport_rec_button_alternate"
-widget "*TransportRecButton-alternate*" style:highest "transport_rec_button_alternate"
-widget "*TransportRecButton*" style:highest "transport_rec_button"
-widget "*RecordingXrunWarningWindow" style:highest "xrun_warn"
-widget "*RecordingXrunWarningWindow*" style:highest "xrun_warn"
-#widget "*MainMenuBar" style:highest "menu_bar_base"
-widget "*ErrorMessage" style:highest "error_message"
-widget "*FatalMessage" style:highest "fatal_message"
-widget "*InfoMessage" style:highest "info_message"
-widget "*WarningMessage" style:highest "warning_message"
-widget "*BigClockNonRecording" style:highest "non_recording_big_clock_display"
-widget "*BigClockRecording" style:highest "recording_big_clock_display"
-widget "*TransportClockDisplay" style:highest "transport_clock_display"
-widget "*SecondaryClockDisplay" style:highest "transport_clock_display"
-widget "*TransportClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*SecondaryClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*AudioClockFramesUpperInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockFramesLowerInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockSMPTEUpperInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockSMPTELowerInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockBBTUpperInfo" style:highest "tempo_meter_clock_display"
-widget "*AudioClockBBTLowerInfo" style:highest "tempo_meter_clock_display"
-widget "*SelectionStartClock" style:highest "default_clock_display"
-widget "*SelectionEndClock" style:highest "default_clock_display"
-widget "*SilenceDurationClock" style:highest "white_on_black_clock_display"
-widget "*EditPointClock" style:highest "default_clock_display"
-widget "*PreRollClock" style:highest "default_clock_display"
-widget "*PostRollClock" style:highest "default_clock_display"
-widget "*NudgeClock" style:highest "default_clock_display"
-widget "*MenuBarClock" style:highest "default_clock_display"
-widget "*ZoomRangeClock" style:highest "default_clock_display"
-widget "*SMPTEOffsetClock" style:highest "default_clock_display"
-widget "*TransportLabel" style:highest "small_bold_text"
-widget "*TakeLabel" style:highest "small_bold_text"
-widget "*LocationLabel" style:highest "small_bold_text"
-widget "*WipeLabel" style:highest "small_bold_text"
-widget "*TakeTagLabel" style:highest "small_bold_text"
-widget "*ToolBarLabel" style:highest "small_bold_text"
-widget "*EditorDisplayLabel" style:highest "small_bold_text"
-widget "*NewSessionLabel" style:highest "larger_text"
-widget "*GlobalButtonLabel" style:highest "default_generic"
-widget "*ClickButton" style:highest "medium_entry"
-widget "*RegionNameDisplay" style:highest "medium_entry"
-widget "*PluginDisplay" style:highest "medium_entry"
-widget "*SelectionDisplay" style:highest "medium_entry"
-widget "*HistorySelector" style:highest "medium_entry"
-widget "*LocationSelector" style:highest "medium_entry"
-widget "*TakeSelector" style:highest "medium_entry"
-widget "*RegionSelector" style:highest "medium_entry"
-widget "*SMPTERuler" style:highest "editor_time_ruler"
-widget "*BBTRuler" style:highest "editor_time_ruler"
-widget "*SamplesRuler" style:highest "editor_time_ruler"
-widget "*TimecodeRuler" style:highest "editor_time_ruler"
-widget "*FramesRuler" style:highest "editor_time_ruler"
-widget "*MinSecRuler" style:highest "editor_time_ruler"
-widget "*BaseFrame" style:highest "base_frame"
-
-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 "*FaderMetricsStrip" style:highest "audio_track_metrics"
-widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
-widget "*AudioBusMetrics" style:highest "audio_bus_metrics"
-widget "*AudioTrackMetricsInactive" style:highest "audio_track_metrics_inactive"
-widget "*AudioBusMetricsInactive" style:highest "audio_bus_metrics_inactive"
-
-widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
-widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
-widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
-widget "*AudioTrackFader" style:highest "gain_fader"
-
-widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
-widget "*AudioBusFader" style:highest "gain_fader"
-widget "*TrackSeparator" style:highest "track_separator"
-widget "*TrackEditIndicator0*" style:highest "edit_group_0"
-widget "*TrackEditIndicator1*" style:highest "edit_group_1"
-widget "*TrackEditIndicator2*" style:highest "edit_group_2"
-widget "*TrackEditIndicator3*" style:highest "edit_group_3"
-widget "*TrackEditIndicator4*" style:highest "edit_group_3"
-widget "*TrackEditIndicator5*" style:highest "edit_group_3"
-widget "*TrackEditIndicator6*" style:highest "edit_group_3"
-widget "*TrackEditIndicator7*" style:highest "edit_group_3"
-widget "*EditorTrackNameDisplay" style:highest "track_name_display"
-widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
-widget "*EditorActiveTrackNameDisplay" style:highest "active_track_name_display"
-widget "*EditorActiveTrackNameDisplay*" style:highest "active_track_name_display"
-widget "*CrossfadeEditAuditionButton" style:highest "red_when_active"
-widget "*CrossfadeEditAuditionButton*" style:highest "red_when_active"
-widget "*CrossfadeEditCurveButton" style:highest "red_when_active"
-widget "*CrossfadeEditCurveButton*" style:highest "red_when_active"
-widget "*CrossfadeEditLabel" style:highest "medium_text"
-widget "*CrossfadeEditFrame" style:highest "base_frame"
-widget "*MouseModeButton" style:highest "mouse_mode_button"
-widget "*MouseModeButton*" style:highest "default_button"
-widget "*EditorMainCanvas" style:highest "main_canvas_area"
-widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*BusControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*AutomationTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
-widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*AutomationTrackControlsBaseInactiveSelected" 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 "*ZoomClickBox" style:highest "medium_bold_entry"
-widget "*PluginParameterLabel" style:highest "medium_text"
-widget "*PluginNameInfo" style:highest "plugin_name_text"
-widget "*PluginMakerInfo" style:highest "plugin_maker_text"
-widget "*PluginParameterInfo" style:highest "medium_text"
-widget "*MotionControllerValue" style:highest "medium_entry"
-widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
-widget "*PluginSlider" style:highest "plugin_slider"
-widget "*EditGroupDisplay" style:highest "treeview_display"
-widget "*TrackListDisplay" style:highest "treeview_display"
-widget "*RegionListDisplay" style:highest "treeview_display"
-widget "*NamedSelectionDisplay" style:highest "treeview_display"
-widget "*SnapshotDisplay" style:highest "treeview_display"
-widget "*MixerTrackCommentArea" style:highest "option_entry"
-widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
-widget "*RegionEditorLabel" style:highest "medium_text"
-widget "*RegionEditorSmallLabel" style:highest "small_text"
-widget "*RegionEditorEntry" style:highest "medium_entry"
-widget "*RegionEditorClock" style:highest "default_clock_display"
-widget "*RegionEditorToggleButton" style:highest "paler_red_when_active"
-widget "*RegionEditorToggleButton*" style:highest "paler_red_when_active"
-widget "*MixerStripSpeedBase" style:highest "small_entry"
-widget "*MixerStripSpeedBase*" style:highest "small_entry"
-widget "*MixerStripSpeedBaseNotOne" style:highest "small_red_on_black_entry"
-widget "*MixerStripSpeedBaseNotOne*" style:highest "small_red_on_black_entry"
-widget "*MixerStripGainDisplay" style:highest "small_entry"
-widget "*MixerStripGainDisplay*" style:highest "small_entry"
-widget "*MixerStripGainUnitButton" style:highest "very_small_button"
-widget "*MixerStripGainUnitButton*" style:highest "very_small_button"
-widget "*MixerStripMeterPreButton" style:highest "very_small_button"
-widget "*MixerStripMeterPreButton*" style:highest "very_small_button"
-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 "*HWMonitorButton" style:highest "red_when_active"
-widget "*HWMonitorButton*" style:highest "red_when_active"
-widget "*MonitorInvertButton" style:highest "monitor_invert_button"
-widget "*MonitorInvertButton*" style:highest "monitor_invert_button"
-widget "*MonitorMuteButton" style:highest "monitor_mute_button"
-widget "*MonitorMuteButton*" style:highest "monitor_mute_button"
-widget "*MonitorDimButton" style:highest "monitor_dim_button"
-widget "*MonitorDimButton*" style:highest "monitor_dim_button"
-widget "*MonitorMonoButton" style:highest "monitor_mono_button"
-widget "*MonitorMonoButton*" style:highest "monitor_mono_button"
-widget "*MonitorInvertButton" style:highest "monitor_invert_button"
-widget "*MonitorInvertButton*" style:highest "monitor_invert_button"
-widget "*MonitorOptButton" style:highest "monitor_opt_button"
-widget "*MonitorOptButton*" style:highest "monitor_opt_button"
-widget "*MonitorIsoAlert" style:highest "monitor_iso_button"
-widget "*MonitorIsoAlert*" style:highest "monitor_iso_button"
-widget "*BypassButton" style:highest "red_when_active"
-widget "*BypassButton*" style:highest "red_when_active"
-widget "*TransportSoloAlert" style:highest "flashing_alert"
-widget "*TransportSoloAlert.*" style:highest "flashing_alert"
-widget "*TransportSoloAlert-active" style:highest "flashing_alert"
-widget "*TransportSoloAlert-alternate" style:highest "flashing_alert"
-widget "*SendAlert" style:highest "green_flashing_alert"
-widget "*SendAlert.*" style:highest "green_flashing_alert"
-widget "*TransportAuditioningAlert" style:highest "flashing_alert"
-widget "*TransportAuditioningAlert.*" style:highest "flashing_alert"
-widget "*FadeCurve" style:highest "medium_bold_entry"
-widget "*FadeCurve*" style:highest "medium_bold_entry"
-widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
-widget "*TearOffArrow" style:highest "tearoff_arrow"
-widget "*RouteParamsTitleButton" style:highest "medium_text"
-widget "*RouteParamsTitleLabel" style:highest "medium_text"
-widget "*PluginAutomateRecordButton" style:highest "small_red_active_and_selected_button"
-widget "*PluginAutomateRecordButton*" style:highest "small_red_active_and_selected_button"
-widget "*PluginAutomatePlayButton" style:highest "small_red_active_and_selected_button"
-widget "*PluginAutomatePlayButton*" style:highest "small_red_active_and_selected_button"
-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 "*PluginEditButton*" style:highest "small_button"
-widget "*PluginLoadButton" style:highest "small_button"
-widget "*PluginLoadButton*" style:highest "small_button"
-
-widget "*MetricDialogFrame" style:highest "base_frame"
-widget "*MetricEntry" style:highest "medium_bold_entry"
-widget "*MetricButton" style:highest "default_button"
-widget "*MetricButton.*" style:highest "default_button"
-widget "*MetricLabel" style:highest "medium_text"
-widget "*TimeStretchButton" style:highest "default_button"
-widget "*TimeStretchButton.*" style:highest "default_button"
-widget "*ChoiceWindow" style:highest "default_generic"
-widget "*ChoicePrompt" style:highest "default_generic"
-widget "*ChoiceButton" style:highest "default_button"
-widget "*ChoiceButton*" style:highest "default_button"
-widget "*SelectionModeButton" style:highest "default_button"
-widget "*SelectionModeButton*" style:highest "default_button"
-widget "*TrackLabel" style:highest "medium_text"
-widget "*TrackPlugName" style:highest "medium_text"
-widget "*TrackParameterName" style:highest "small_italic_text"
-widget "*AddRouteDialog*" style:highest "medium_text"
-widget "*AddRouteDialog.GtkLabel" style:highest "medium_text"
-widget "*AddRouteDialogChannelChoice" style:highest "medium_bold_entry"
-widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
-widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
-widget "*AddRouteDialogRadioButton" style:highest "red_when_active"
-widget "*AddRouteDialogButton" style:highest "default_button"
-widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
-widget "*NewSessionIOLabel" style:highest "large_bold_text"
-widget "*NewSessionSR1Label" style:highest "red_medium_text"
-widget "*NewSessionSR2Label" style:highest "medium_text"
-widget "*NewSessionChannelChoice" style:highest "medium_bold_entry"
-widget "*NewSessionMainButton" style:highest "large_bold_text"
-widget "*NewSessionMainButton*" style:highest "large_bold_text"
-widget "*NewSessionMainLabel" style:highest "large_bold_text"
-widget "*LocationEditRowClock" style:highest "location_rows_clock"
-widget "*LocationEditNameLabel" style:highest "medium_text"
-widget "*LocationEditSetButton" style:highest "location_row_button"
-widget "*LocationEditSetButton*" style:highest "location_row_button"
-widget "*LocationEditGoButton" style:highest "location_row_button"
-widget "*LocationEditGoButton*" style:highest "location_row_button"
-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 "*LocationLocEditorFrame" style:highest "base_frame"
-widget "*LocationRangeEditorFrame" style:highest "base_frame"
-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 "*ChannelCountSelector.GtkArrow" style:highest "default_generic"
-widget "*RegionListWholeFile" style:highest "treeview_parent_node"
-widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
-widget "*MidiListView*" style:highest "treeview_display"
-widget "*ProcessorList*" style:highest "processor_list"
-widget "*ProcessorFrameSelected" style:highest "processor_frame_selected"
-widget "*ProcessorFrameActiveSend" style:highest "processor_frame_active_send"
-widget "*ProcessorFaderFrame" style:highest "processor_fader_frame"
-widget "*ProcessorPreFader" style:highest "processor_prefader"
-widget "*ProcessorPreFaderFrame" style:highest "processor_prefader_frame"
-widget "*ProcessorFader" style:highest "processor_fader"
-widget "*ProcessorPostFader" style:highest "processor_postfader"
-widget "*ProcessorPostFaderFrame" style:highest "processor_postfader_frame"
-widget "*PortMatrixLabel*" style:highest "small_text"
-widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
-widget "*SoloIsolatedLED" style:highest "solo_isolate_led"
-widget "*SoloSafeLED" style:highest "solo_safe_led"
-widget "*SoloLEDLabel" style:highest "very_small_text"
-widget "*ContrastingPopup" style:highest "contrasting_popup"
-widget "*ContrastingPopup*" style:highest "contrasting_popup"
-
-widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
-widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
-
-style "tooltip" = "medium_text"
-{
-        fg[NORMAL] = @@COLPREFIX@_fg_tooltip
-        bg[NORMAL] = @@COLPREFIX@_bg_tooltip
-}
-widget "gtk-tooltip*" style:highest "tooltip"
+include "ardour3_light_fonts.rc"
+include "ardour3_light_styles.rc"
+include "ardour3_widgets.rc"
diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
new file mode 100644
index 0000000000..8c49427f6a
--- /dev/null
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -0,0 +1,404 @@
+class "GtkWidget" style:highest "default"
+class "GtkScrollbar" style:highest "ardour_adjusters"
+class "GtkLabel" style:highest "default_generic"
+class "GtkButton" style:highest "ardour_button"
+class "GtkArrow" style:highest "tearoff_arrow"
+class "GtkProgressBar" style:highest "ardour_progressbars"
+
+widget "gtk-tooltip*" style:highest "tooltip"
+
+widget "*PaddedButton" style:highest "padded_button"
+widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
+widget "*MarkerText" style:highest "marker_text"
+widget "*TimeAxisViewItemName*" style:highest "time_axis_view_item_name"
+widget "*EditModeSelector" style:highest "medium_bold_entry"
+widget "*SnapTypeSelector" style:highest "medium_bold_entry"
+widget "*SnapModeSelector" style:highest "medium_bold_entry"
+widget "*ZoomFocusSelector" style:highest "medium_bold_entry"
+widget "*ArdourContextMenu*" style:highest "default_menu"
+widget "*EditGroupTitleButton*" style:highest "default_button"
+widget "*MixerGroupTitleButton*" style:highest "default_button"
+widget "*ErrorLogCloseButton" style:highest "default_button"
+widget "*EditorGTKButton*" style:highest "default_button" 
+widget "*ToolbarButton" style:highest "default_button"
+widget "*ToolbarButton*" style:highest "default_button"
+widget "*CrossfadeEditButton" style:highest "default_button"
+widget "*CrossfadeEditButton*" style:highest "default_button"
+widget "*TrackHistoryButton*" style:highest "default_button"
+widget "*TrackSizeButton*" style:highest "default_button"
+widget "*TrackPlaylistButton*" style:highest "default_button"
+widget "*TrackAutomationButton*" style:highest "default_button"
+widget "*TrackGroupButton*" style:highest "default_button"
+widget "*TrackMixButton*" style:highest "default_button"
+widget "*TrackVisualButton*" style:highest "default_button"
+widget "*TrackRemoveButton*" style:highest "default_button"
+widget "*BaseButton" style:highest "default_button"
+widget "*TakeButtonLabel" style:highest "default_button"
+widget "*MixerWidthButton" style:highest "default_button"
+widget "*MixerHideButton" style:highest "default_button"
+widget "*MixerSendButton" style:highest "default_button"
+widget "*MixerSendButtonLabel" style:highest "default_button"
+widget "*MixerSendSwitch" style:highest "default_button"
+widget "*MixerInsertButton" style:highest "default_button"
+widget "*MixerInsertButtonLabel" style:highest "default_button"
+widget "*MixerInsertSwitch" style:highest "default_button"
+widget "*MixerMonitorInputButton*" style:highest "very_small_button"
+widget "*MixerMonitorInputButton.*" style:highest "very_small_button"
+widget "*MixerIOButton" style:highest "very_small_button"
+widget "*MixerIOButtonLabel" style:highest "very_small_button"
+widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
+widget "*AddRouteDialogRadioButton*" style:highest "preferences"
+widget "*OptionsNotebook" style:highest "preferences"
+widget "*OptionEditorToggleButton*" style:highest "preferences"
+widget "*OptionsLabel" style:highest "preferences"
+widget "*OptionEditorAuditionerLabel" style:highest "preferences"
+widget "*OptionsEntry" style:highest "option_entry"
+widget "*InspectorNotebook" style:highest "preferences"
+widget "*NewSessionDialog" style:highest "preferences"
+widget "*NewSessionDialogButton*" style:highest "preferences"
+widget "*MixerSendSwitch*" style:highest "very_small_red_active_and_selected_button"
+widget "*OptionEditorToggleButton" style:highest "small_red_active_and_selected_button"
+widget "*NewSessionDialogButton" style:highest "small_red_active_and_selected_button"
+widget "*RecordEnableButton" style:highest "track_rec_enable_button"
+widget "*RecordEnableButton-active" style:highest "track_rec_enable_button_active"
+widget "*RecordEnableButton-alternate" style:highest "track_rec_enable_button_alternate"
+widget "*RecordEnableButton-alternate2" style:highest "track_rec_enable_button_alternate_two"
+widget "*MixerRecordEnableButton" style:highest "mixer_track_rec_enable_button"
+widget "*MixerRecordEnableButton-active" style:highest "mixer_track_rec_enable_button_active"
+widget "*MixerRecordEnableButton-alternate" style:highest "mixer_track_rec_enable_button_alternate"
+widget "*MuteButton" style:highest "mute_button"
+widget "*MuteButton-alternate" style:highest "mute_button_fullylit"
+widget "*MuteButton-active" style:highest "mute_button_halflit"
+widget "*MixerMuteButton" style:highest "mixer_mute_button"
+widget "*MixerMuteButton-alternate" style:highest "mixer_mute_button_fullylit"
+widget "*MixerMuteButton-active" style:highest "mixer_mute_button_halflit"
+widget "*SoloButton" style:highest "solo_button"
+widget "*SoloButton-alternate" style:highest "solo_button_alternate"
+widget "*SoloButton-alternate2" style:highest "solo_button_alternate2"
+widget "*SoloButton-active" style:highest "solo_button_active"
+widget "*MixerSoloButton" style:highest "mixer_solo_button"
+widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate"
+widget "*MixerSoloButton-alternate2" style:highest "mixer_solo_button_alternate2"
+widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active"
+widget "*TrackLoopButton*" style:highest "track_loop_button"
+widget "*PanAutomationLineSelector*" style:highest "multiline_combo"
+widget "*EditorTimeButton*" style:highest "time_button"
+widget "*MixerInvertButton*" style:highest "mixer_invert_button"
+widget "*MixerInvertButton.*" style:highest "mixer_invert_button"
+widget "*MixerAutomationRecordingButton*" style:highest "very_small_button"
+widget "*MixerAutomationRecordingButton.*" style:highest "very_small_button"
+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 "*MixerNameButton" style:highest "very_small_button"
+widget "*MixerNameButtonLabel" style:highest "very_small_button"
+widget "*MixerGroupButton" style:highest "very_small_button"
+widget "*MixerGroupButtonLabel" style:highest "very_small_button"
+widget "*MixerCommentButton" style:highest "very_small_button"
+widget "*MixerCommentButton*" style:highest "very_small_button"
+widget "*MixerMonoButton*" style:highest "very_small_button"
+widget "*EditGroupButton" style:highest "very_small_button"
+widget "*EditGroupButtonLabel" style:highest "very_small_button"
+widget "*TransportButton" style:highest "transport_button"
+widget "*TransportButton-active" style:highest "transport_button_active"
+widget "*TransportButton-alternate2" style:highest "transport_button_alternate_two"
+widget "*TransportSyncButton" style:highest "transport_button"
+widget "*TransportSyncButton*" style:highest "transport_button"
+widget "*TransportSyncButton-active" style:highest "sync_alert"
+widget "*TransportSyncButton-active*" style:highest "sync_alert"
+widget "*ShuttleButton" style:highest "transport_button"
+widget "*ShuttleButton*" style:highest "transport_button"
+widget "*ShuttleDisplay" style:highest "transport_button"
+widget "*ShuttleDisplay*" style:highest "transport_button"
+widget "*ShuttleControl" style:highest "shuttle_control"
+widget "*TransportRecButton" style:highest "transport_rec_button"
+widget "*TransportRecButton*" style:highest "transport_rec_button"
+widget "*TransportRecButton-active" style:highest "transport_rec_button_active"
+widget "*TransportRecButton-active*" style:highest "transport_rec_button_active"
+widget "*TransportRecButton-alternate" style:highest "transport_rec_button_alternate"
+widget "*TransportRecButton-alternate*" style:highest "transport_rec_button_alternate"
+widget "*TransportRecButton*" style:highest "transport_rec_button"
+widget "*RecordingXrunWarningWindow" style:highest "xrun_warn"
+widget "*RecordingXrunWarningWindow*" style:highest "xrun_warn"
+#widget "*MainMenuBar" style:highest "menu_bar_base"
+widget "*ErrorMessage" style:highest "error_message"
+widget "*FatalMessage" style:highest "fatal_message"
+widget "*InfoMessage" style:highest "info_message"
+widget "*WarningMessage" style:highest "warning_message"
+widget "*BigClockNonRecording" style:highest "non_recording_big_clock_display"
+widget "*BigClockRecording" style:highest "recording_big_clock_display"
+widget "*SelectionClockDisplay" style:highest "selection_clock_display"
+widget "*PunchClockDisplay" style:highest "punch_clock_display"
+widget "*TransportClockDisplay" style:highest "transport_clock_display"
+widget "*SecondaryClockDisplay" style:highest "transport_clock_display"
+widget "*TransportClockDisplayDelta" style:highest "transport_clock_display_delta"
+widget "*SecondaryClockDisplayDelta" style:highest "transport_clock_display_delta"
+widget "*AudioClockFramesUpperInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockFramesLowerInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockSMPTEUpperInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockSMPTELowerInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockBBTUpperInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockBBTLowerInfo" style:highest "tempo_meter_clock_display"
+widget "*SelectionStartClock" style:highest "default_clock_display"
+widget "*SelectionEndClock" style:highest "default_clock_display"
+widget "*SilenceDurationClock" style:highest "white_on_black_clock_display"
+widget "*EditPointClock" style:highest "default_clock_display"
+widget "*PreRollClock" style:highest "default_clock_display"
+widget "*PostRollClock" style:highest "default_clock_display"
+widget "*NudgeClock" style:highest "default_clock_display"
+widget "*MenuBarClock" style:highest "default_clock_display"
+widget "*ZoomRangeClock" style:highest "default_clock_display"
+widget "*SMPTEOffsetClock" style:highest "default_clock_display"
+widget "*TransportLabel" style:highest "small_bold_text"
+widget "*TakeLabel" style:highest "small_bold_text"
+widget "*LocationLabel" style:highest "small_bold_text"
+widget "*WipeLabel" style:highest "small_bold_text"
+widget "*TakeTagLabel" style:highest "small_bold_text"
+widget "*ToolBarLabel" style:highest "small_bold_text"
+widget "*EditorDisplayLabel" style:highest "small_bold_text"
+widget "*NewSessionLabel" style:highest "larger_text"
+widget "*GlobalButtonLabel" style:highest "default_generic"
+widget "*ClickButton" style:highest "medium_entry"
+widget "*RegionNameDisplay" style:highest "medium_entry"
+widget "*PluginDisplay" style:highest "medium_entry"
+widget "*SelectionDisplay" style:highest "medium_entry"
+widget "*HistorySelector" style:highest "medium_entry"
+widget "*LocationSelector" style:highest "medium_entry"
+widget "*TakeSelector" style:highest "medium_entry"
+widget "*RegionSelector" style:highest "medium_entry"
+widget "*SMPTERuler" style:highest "editor_time_ruler"
+widget "*BBTRuler" style:highest "editor_time_ruler"
+widget "*SamplesRuler" style:highest "editor_time_ruler"
+widget "*TimecodeRuler" style:highest "editor_time_ruler"
+widget "*FramesRuler" style:highest "editor_time_ruler"
+widget "*MinSecRuler" style:highest "editor_time_ruler"
+widget "*BaseFrame" style:highest "base_frame"
+
+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 "*FaderMetricsStrip" style:highest "audio_track_metrics"
+widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
+widget "*MidiTrackMetrics" style:highest "midi_track_metrics"
+widget "*AudioBusMetrics" style:highest "audio_bus_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 "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
+widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
+widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
+widget "*AudioTrackFader" style:highest "gain_fader"
+
+widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
+widget "*AudioBusFader" style:highest "gain_fader"
+widget "*TrackSeparator" style:highest "track_separator"
+widget "*TrackEditIndicator0*" style:highest "edit_group_0"
+widget "*TrackEditIndicator1*" style:highest "edit_group_1"
+widget "*TrackEditIndicator2*" style:highest "edit_group_2"
+widget "*TrackEditIndicator3*" style:highest "edit_group_3"
+widget "*TrackEditIndicator4*" style:highest "edit_group_3"
+widget "*TrackEditIndicator5*" style:highest "edit_group_3"
+widget "*TrackEditIndicator6*" style:highest "edit_group_3"
+widget "*TrackEditIndicator7*" style:highest "edit_group_3"
+widget "*EditorTrackNameDisplay" style:highest "track_name_display"
+widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
+widget "*EditorActiveTrackNameDisplay" style:highest "active_track_name_display"
+widget "*EditorActiveTrackNameDisplay*" style:highest "active_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 "*CrossfadeEditLabel" style:highest "medium_text"
+widget "*CrossfadeEditFrame" style:highest "base_frame"
+widget "*MouseModeButton" style:highest "mouse_mode_button"
+widget "*MouseModeButton*" style:highest "default_button"
+widget "*EditorMainCanvas" style:highest "main_canvas_area"
+widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
+widget "*BusControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
+widget "*AutomationTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
+widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
+widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
+widget "*AutomationTrackControlsBaseInactiveSelected" 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 "*ZoomClickBox" style:highest "medium_bold_entry"
+widget "*PluginParameterLabel" style:highest "medium_text"
+widget "*PluginNameInfo" style:highest "plugin_name_text"
+widget "*PluginMakerInfo" style:highest "plugin_maker_text"
+widget "*PluginParameterInfo" style:highest "medium_text"
+widget "*MotionControllerValue" style:highest "medium_entry"
+widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
+widget "*PluginUIClickBox" style:highest "medium_bold_entry"
+widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
+widget "*PluginSlider" style:highest "plugin_slider"
+widget "*EditGroupDisplay" style:highest "treeview_display"
+widget "*TrackListDisplay" style:highest "treeview_display"
+widget "*RegionListDisplay" style:highest "treeview_display"
+widget "*NamedSelectionDisplay" style:highest "treeview_display"
+widget "*SnapshotDisplay" style:highest "treeview_display"
+widget "*MixerTrackCommentArea" style:highest "option_entry"
+widget "*MixerPanZone" style:highest "pan_zone"
+widget "*MixerTrackDisplayList" style:highest "treeview_display"
+widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
+widget "*MixerAuxDisplayList" style:highest "treeview_display"
+widget "*MixerGroupList" style:highest "treeview_display"
+widget "*RegionEditorLabel" style:highest "medium_text"
+widget "*RegionEditorSmallLabel" style:highest "small_text"
+widget "*RegionEditorEntry" style:highest "medium_entry"
+widget "*RegionEditorClock" style:highest "default_clock_display"
+widget "*RegionEditorToggleButton" style:highest "paler_bright_when_active"
+widget "*RegionEditorToggleButton*" style:highest "paler_bright_when_active"
+widget "*MixerStripSpeedBase" style:highest "small_entry"
+widget "*MixerStripSpeedBase*" style:highest "small_entry"
+widget "*MixerStripSpeedBaseNotOne" style:highest "small_red_on_black_entry"
+widget "*MixerStripSpeedBaseNotOne*" style:highest "small_red_on_black_entry"
+widget "*MixerStripGainDisplay" style:highest "small_entry"
+widget "*MixerStripGainDisplay*" style:highest "small_entry"
+widget "*MixerStripGainUnitButton" style:highest "very_small_button"
+widget "*MixerStripGainUnitButton*" style:highest "very_small_button"
+widget "*MixerStripMeterPreButton" style:highest "very_small_button"
+widget "*MixerStripMeterPreButton*" style:highest "very_small_button"
+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 "*HWMonitorButton" style:highest "bright_when_active"
+widget "*HWMonitorButton*" style:highest "bright_when_active"
+widget "*MonitorInvertButton" style:highest "monitor_invert_button"
+widget "*MonitorInvertButton*" style:highest "monitor_invert_button"
+widget "*MonitorMuteButton" style:highest "monitor_mute_button"
+widget "*MonitorMuteButton*" style:highest "monitor_mute_button"
+widget "*MonitorDimButton" style:highest "monitor_dim_button"
+widget "*MonitorDimButton*" style:highest "monitor_dim_button"
+widget "*MonitorMonoButton" style:highest "monitor_mono_button"
+widget "*MonitorMonoButton*" style:highest "monitor_mono_button"
+widget "*MonitorInvertButton" style:highest "monitor_invert_button"
+widget "*MonitorInvertButton*" style:highest "monitor_invert_button"
+widget "*MonitorOptButton" style:highest "monitor_opt_button"
+widget "*MonitorOptButton*" style:highest "monitor_opt_button"
+widget "*MonitorIsoAlert" style:highest "monitor_iso_button"
+widget "*MonitorIsoAlert*" style:highest "monitor_iso_button"
+widget "*BypassButton" style:highest "bright_when_active"
+widget "*BypassButton*" style:highest "bright_when_active"
+widget "*TransportSoloAlert" style:highest "flashing_alert"
+widget "*TransportSoloAlert.*" style:highest "flashing_alert"
+widget "*TransportSoloAlert-active" style:highest "flashing_alert"
+widget "*TransportSoloAlert-alternate" style:highest "flashing_alert"
+widget "*SendAlert" style:highest "green_flashing_alert"
+widget "*SendAlert.*" style:highest "green_flashing_alert"
+widget "*TransportAuditioningAlert" style:highest "flashing_alert"
+widget "*TransportAuditioningAlert.*" style:highest "flashing_alert"
+widget "*FadeCurve" style:highest "medium_bold_entry"
+widget "*FadeCurve*" style:highest "medium_bold_entry"
+widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
+widget "*TearOffArrow" style:highest "tearoff_arrow"
+widget "*RouteParamsTitleButton" style:highest "medium_text"
+widget "*RouteParamsTitleLabel" style:highest "medium_text"
+widget "*PluginAutomateRecordButton" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomateRecordButton*" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomatePlayButton" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomatePlayButton*" style:highest "small_red_active_and_selected_button"
+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 "*PluginEditButton*" style:highest "small_button"
+widget "*PluginLoadButton" style:highest "small_button"
+widget "*PluginLoadButton*" style:highest "small_button"
+
+widget "*MetricDialogFrame" style:highest "base_frame"
+widget "*MetricEntry" style:highest "medium_bold_entry"
+widget "*MetricButton" style:highest "default_button"
+widget "*MetricButton.*" style:highest "default_button"
+widget "*MetricLabel" style:highest "medium_text"
+widget "*TimeStretchButton" style:highest "default_button"
+widget "*TimeStretchButton.*" style:highest "default_button"
+widget "*ChoiceWindow" style:highest "default_generic"
+widget "*ChoicePrompt" style:highest "default_generic"
+widget "*ChoiceButton" style:highest "default_button"
+widget "*ChoiceButton*" style:highest "default_button"
+widget "*SelectionModeButton" style:highest "default_button"
+widget "*SelectionModeButton*" style:highest "default_button"
+widget "*TrackLabel" style:highest "medium_text"
+widget "*TrackPlugName" style:highest "medium_text"
+widget "*TrackParameterName" style:highest "small_italic_text"
+widget "*AddRouteDialog*" style:highest "medium_text"
+widget "*AddRouteDialog.GtkLabel" style:highest "medium_text"
+widget "*AddRouteDialogChannelChoice" style:highest "medium_bold_entry"
+widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
+widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
+widget "*AddRouteDialogRadioButton" style:highest "bright_when_active"
+widget "*AddRouteDialogButton" style:highest "default_button"
+widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
+widget "*NewSessionIOLabel" style:highest "large_bold_text"
+widget "*NewSessionSR1Label" style:highest "red_medium_text"
+widget "*NewSessionSR2Label" style:highest "medium_text"
+widget "*NewSessionChannelChoice" style:highest "medium_bold_entry"
+widget "*NewSessionMainButton" style:highest "large_bold_text"
+widget "*NewSessionMainButton*" style:highest "large_bold_text"
+widget "*NewSessionMainLabel" style:highest "large_bold_text"
+widget "*LocationEditRowClock" style:highest "location_rows_clock"
+widget "*LocationEditNameLabel" style:highest "medium_text"
+widget "*LocationEditSetButton" style:highest "location_row_button"
+widget "*LocationEditSetButton*" style:highest "location_row_button"
+widget "*LocationEditGoButton" style:highest "location_row_button"
+widget "*LocationEditGoButton*" style:highest "location_row_button"
+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 "*LocationLocEditorFrame" style:highest "base_frame"
+widget "*LocationRangeEditorFrame" style:highest "base_frame"
+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 "*ChannelCountSelector.GtkArrow" style:highest "default_generic"
+widget "*RegionListWholeFile" style:highest "treeview_parent_node"
+widget "*EditorHScrollbar" style:highest "editor_hscrollbar"
+widget "*MidiListView*" style:highest "treeview_display"
+widget "*ProcessorList*" style:highest "processor_list"
+widget "*ProcessorFrameSelected" style:highest "processor_frame_selected"
+widget "*ProcessorFrameActiveSend" style:highest "processor_frame_active_send"
+widget "*ProcessorFaderFrame" style:highest "processor_fader_frame"
+widget "*ProcessorPreFader" style:highest "processor_prefader"
+widget "*ProcessorPreFaderFrame" style:highest "processor_prefader_frame"
+widget "*ProcessorFader" style:highest "processor_fader"
+widget "*ProcessorPostFader" style:highest "processor_postfader"
+widget "*ProcessorPostFaderFrame" style:highest "processor_postfader_frame"
+widget "*PortMatrixLabel*" style:highest "small_text"
+widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
+widget "*SoloIsolatedLED" style:highest "solo_isolate_led"
+widget "*SoloSafeLED" style:highest "solo_safe_led"
+widget "*SoloLEDLabel" style:highest "very_small_text"
+widget "*ContrastingPopup" style:highest "contrasting_popup"
+widget "*ContrastingPopup*" style:highest "contrasting_popup"
+widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
+widget "*TimeInfoSelectionTitle" style:highest "very_small_bright_when_active"
+widget "*TimeInfoSelectionLabel" style:highest "very_small_bright_when_active"
+widget "*TimeInfoPunchTitle" style:highest "very_small_bright_when_active"
+widget "*TimeInfoPunchLabel" style:highest "very_small_bright_when_active"
+widget "*TimeInfoPunchButton" style:highest "punch_button"
+
+widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
+widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
+
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 0230d5ce4a..0418119c39 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -168,7 +168,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	, auto_return_button (_("Auto Return"))
 	, auto_play_button (_("Auto Play"))
 	, auto_input_button (_("Auto Input"))
-	, click_button (_("Click"))
+	  // , click_button (_("Click"))
 	, time_master_button (_("time\nmaster"))
 
 	, auditioning_alert_button (_("AUDITION"))
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 5c2ca58087..9329047957 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -323,9 +323,6 @@ ARDOUR_UI::setup_transport ()
 	ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button);
 	ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
 	ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
-	ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
-
-	click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
 
 	preroll_button.set_name ("TransportButton");
 	postroll_button.set_name ("TransportButton");
@@ -409,6 +406,16 @@ ARDOUR_UI::setup_transport ()
 	transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0);
 	transport_tearoff_hbox.pack_start (*clock_box, false, false, 0);
 
+	w = manage (new Image (get_icon (X_("metronome"))));
+	w->show ();
+	click_button.add (*w);
+
+	ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
+
+	click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
+
+	transport_tearoff_hbox.pack_start (click_button, false, false, 4);
+
 	time_info_box = manage (new TimeInfoBox);
 	transport_tearoff_hbox.pack_start (*time_info_box, false, false);
 
@@ -423,7 +430,7 @@ ARDOUR_UI::setup_transport ()
 
 	VBox* io_box = manage (new VBox);
 	io_box->pack_start (auto_input_button, false, false);
-	io_box->pack_start (click_button, false, false);
+	//io_box->pack_start (click_button, false, false);
         if (!Profile->get_small_screen()) {
                 toggle_box->pack_start (*io_box, false, false);
         }
diff --git a/gtk2_ardour/icons/metronome.png b/gtk2_ardour/icons/metronome.png
new file mode 100644
index 0000000000..1a3f170914
--- /dev/null
+++ b/gtk2_ardour/icons/metronome.png
diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc
index fe6fe23bc3..fa092ea913 100644
--- a/gtk2_ardour/time_info_box.cc
+++ b/gtk2_ardour/time_info_box.cc
@@ -116,29 +116,8 @@ TimeInfoBox::TimeInfoBox ()
         left.attach (*l, 0, 1, 3, 4, FILL);
         left.attach (*selection_length, 1, 2, 3, 4);
 
-	punch_title.set_name ("TimeInfoSelectionTitle");
-	right.attach (punch_title, 2, 4, 0, 1);
-	l = manage (new Label);
-	l->set_alignment (1.0, 0.5);
-	l->set_text (_("In"));
-	l->set_name (X_("TimeInfoPunchLabel"));
-        right.attach (*l, 2, 3, 1, 2, FILL);
-        right.attach (*punch_start, 3, 4, 1, 2);
-
-	l = manage (new Label);
-	l->set_alignment (1.0, 0.5);
-	l->set_text (_("Out"));
-	l->set_name (X_("TimeInfoPunchLabel"));
-        right.attach (*l, 2, 3, 2, 3, FILL);
-        right.attach (*punch_end, 3, 4, 2, 3);
-
 	punch_in_button.set_name ("TimeInfoPunchButton");
 	punch_out_button.set_name ("TimeInfoPunchButton");
-	punch_button_box.set_homogeneous (true);
-	punch_button_box.set_spacing (6);
-	punch_button_box.set_border_width (2);
-	punch_button_box.pack_start (punch_in_button, true, true);
-	punch_button_box.pack_start (punch_out_button, true, true);
 
 	ActionManager::get_action ("Transport", "TogglePunchIn")->connect_proxy (punch_in_button);
 	ActionManager::get_action ("Transport", "TogglePunchOut")->connect_proxy (punch_out_button);
@@ -146,7 +125,12 @@ TimeInfoBox::TimeInfoBox ()
 	Gtkmm2ext::UI::instance()->set_tip (punch_in_button, _("Start recording at auto-punch start"));
 	Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end"));
 
-	right.attach (punch_button_box, 2, 4, 3, 4, FILL, FILL);
+	punch_title.set_name ("TimeInfoSelectionTitle");
+	right.attach (punch_title, 2, 4, 0, 1);
+        right.attach (punch_in_button, 2, 3, 1, 2, FILL);
+        right.attach (*punch_start, 3, 4, 1, 2);
+        right.attach (punch_out_button, 2, 3, 2, 3, FILL);
+        right.attach (*punch_end, 3, 4, 2, 3);
 
         show_all ();
 
diff --git a/gtk2_ardour/time_info_box.h b/gtk2_ardour/time_info_box.h
index c9231f0463..7409d7631e 100644
--- a/gtk2_ardour/time_info_box.h
+++ b/gtk2_ardour/time_info_box.h
@@ -71,7 +71,6 @@ class TimeInfoBox : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
     Gtkmm2ext::StatefulToggleButton punch_in_button;
     Gtkmm2ext::StatefulToggleButton punch_out_button;
-    Gtk::HBox punch_button_box;
 
     void selection_changed ();
 
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 9f0262f736..d357d1e277 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -459,17 +459,46 @@ def build(bld):
     light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT'
 
     obj              = bld.new_task_gen('subst')
-    obj.source       = 'ardour3_ui_dark.rc.in'
+    obj.source       = [ 'ardour3_ui_dark.rc.in' ]
     obj.target       = 'ardour3_ui_dark.rc'
     obj.dict         = dark_rc_subst_dict
     obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
 
     obj              = bld.new_task_gen('subst')
-    obj.source       = 'ardour3_ui_light.rc.in'
+    obj.source       = [ 'ardour3_ui_light.rc.in' ]
     obj.target       = 'ardour3_ui_light.rc'
     obj.dict         = light_rc_subst_dict
     obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
 
+    obj              = bld.new_task_gen('subst')
+    obj.source       = [ 'ardour3_styles.rc.in' ]
+    obj.target       = 'ardour3_dark_styles.rc'
+    obj.dict         = dark_rc_subst_dict
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = [ 'ardour3_styles.rc.in' ]
+    obj.target       = 'ardour3_light_styles.rc'
+    obj.dict         = light_rc_subst_dict
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = [ 'ardour3_fonts.rc.in' ]
+    obj.target       = 'ardour3_dark_fonts.rc'
+    obj.dict         = dark_rc_subst_dict
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
+    obj              = bld.new_task_gen('subst')
+    obj.source       = [ 'ardour3_fonts.rc.in' ]
+    obj.target       = 'ardour3_light_fonts.rc'
+    obj.dict         = light_rc_subst_dict
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
+    obj              = bld.new_task_gen('copy')
+    obj.source       = [ 'ardour3_widget_list.rc' ]
+    obj.target       = 'ardour3_widgets.rc'
+    obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
+
     # Menus
     menus_argv = []
     if bld.env['GTKOSX']:
@@ -510,7 +539,9 @@ def build(bld):
 
     # Default UI configuration
     bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
-
+    # Generic widget style mappings
+    bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_widgets.rc')
+    
     # Default export stuff
     bld.install_files('${CONFIGDIR}/ardour3/export', 'export/*.format')