X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fclearlooks.rc.in;h=a73249656994298d656c04a742673d264c806386;hb=a79fe239355b8c6f4e86da2eb1eec43c6c4dd052;hp=68f3cc64b5c6e110dfec0d0f5511aa3943bf3c29;hpb=64fa63212f7e79bab16147817211a33a3f7c8fba;p=ardour.git

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 68f3cc64b5..a732496569 100644
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -1,12 +1,17 @@
+gtk-button-images = 0							      # [ Default value: 1 ] Show stock icons on buttons.
+
 style "default" = "medium_text"
 {
   #Original values for reference
 
-  GtkTreeView::vertical-padding = 0
-  GtkTreeView::horizontal-padding = 0
-  GtkTreeView::even-row-color = shade(0.25,@bases)
-  GtkTreeView::odd-row-color = lighter(lighter(@bases))
-  
+  GtkTreeView         :: vertical-padding                 = 0
+  GtkTreeView         :: horizontal-padding               = 0
+  GtkTreeView         :: even-row-color                   = @bases
+  GtkTreeView         :: odd-row-color                    = @bases
+  GtkTreeView         :: focus-line-width                 = 0
+  GtkTreeView         :: tree-line-width                  = 1
+  GtkTreeView         :: row-ending-details               = 0
+
   GtkWidget           :: focus-line-pattern               = "\001\001"        #                              Dash pattern used to draw the focus indicator.
   GtkWidget           :: focus-line-width                 = 1                 # [               1 ] ( >= 0 ) Width, in pixels, of the focus indicator line.
   GtkWidget           :: focus-padding                    = 1                 # [               1 ] ( >= 0 ) Width, in pixels, between focus indicator and the widget box.
@@ -15,12 +20,11 @@ style "default" = "medium_text"
   GtkWidget           :: scroll-arrow-vlength             = 16                # [              16 ] ( >= 1 ) Length of vertical scroll arrows.
   GtkWidget           :: link-color                       = shade(1.25, @bright_color)
   GtkWidget           :: visited-link-color               = @bright_color
-  
+
   GtkDialog           :: action-area-border               = 4                 # [               5 ] ( >= 0 ) Width of border around the button area at the bottom of the dialog.
   GtkDialog           :: button-spacing                   = 4                 # [               6 ] ( >= 0 ) Spacing between buttons.
   GtkDialog           :: content-area-border              = 2                 # [               2 ] ( >= 0 ) Width of border around the main dialog area.
   GtkDialog           :: content-area-spacing             = 0                 # [               0 ] ( >= 0 ) The default spacing used between elements of the content area of the dialog.
-  
 
   GtkButton           :: default-border = { 0, 0, 0, 0 }
   GtkButton           :: default-outside_border = { 0, 0, 0, 0 }
@@ -45,7 +49,7 @@ style "default" = "medium_text"
   GtkPaned            :: handle-size                      = 4                 # [               5 ] ( >= 0 ) Width of handle.
 
   GtkScale            :: activate-slider                  = 1                 # [               0 ] ( bool ) With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged.
-  GtkScale            :: slider-length                    = 23                # [              31 ] ( >= 0 ) Length of scale's slider.	
+  GtkScale            :: slider-length                    = 23                # [              31 ] ( >= 0 ) Length of scale's slider.
   GtkScale            :: slider-width                     = 14                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.
   GtkScale            :: trough-side-details              = 1                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.
 
@@ -53,10 +57,10 @@ style "default" = "medium_text"
   GtkScrollbar        :: arrow-scaling                    = 0.4               # [             0.5 ] ( 0.1  ) The arrow size proportion relative to the scroll button size.
   GtkScrollbar        :: fixed-slider-length              = 0                 # [               0 ] ( bool ) Don't change slider size, just lock it to the minimum length.
   GtkScrollbar        :: min-slider-length                = 50                # [              21 ] ( >= 0 ) Minimum length of scrollbar slider.
-  GtkScrollbar        :: slider-width                     = 15                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.    
+  GtkScrollbar        :: slider-width                     = 15                # [              14 ] ( >= 0 ) Width of scrollbar or scale thumb.
   GtkScrollbar        :: stepper-spacing                  = 0                 # [               0 ] ( >= 0 ) The spacing between the stepper buttons and thumb. Note that setting this value to anything > 0 will automatically set the trough-under-steppers style property to TRUE as well. Also, stepper-spacing won't have any effect if there are no steppers.
   GtkScrollbar        :: trough-border                    = 0                 # [               1 ] ( >= 0 ) Spacing between thumb/steppers and outer trough bevel.
-  GtkScrollbar        :: trough-side-details              = 0                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.    
+  GtkScrollbar        :: trough-side-details              = 0                 # [               0 ] ( bool ) When TRUE, the parts of the trough on the two sides of the slider are drawn with different details.
   GtkScrollbar        :: trough-under-steppers            = 1                 # [               1 ] ( bool ) Whether to draw the trough across the full length of the range or to exclude the steppers and their spacing. Note that setting the "stepper-spacing" style property to any value > 0 will automatically enable trough-under-steppers too.
 
   GtkScrollbar        :: has-backward-stepper             = 1                 # [               1 ] ( bool ) Display the standard backward arrow button.
@@ -71,7 +75,7 @@ style "default" = "medium_text"
 
 #Menu Properties
   GtkMenuBar          :: internal-padding                 = 1                 # [               1 ] ( >= 0 ) Amount of border space between the menubar shadow and the menu items.
-  GtkMenuBar          :: shadow-type                      = GTK_SHADOW_OUT    # [  GTK_SHADOW_OUT ]          Style of bevel around the menubar. 
+  GtkMenuBar          :: shadow-type                      = GTK_SHADOW_OUT    # [  GTK_SHADOW_OUT ]          Style of bevel around the menubar.
 
   GtkMenu             :: arrow-placement                  = GTK_ARROWS_BOTH   # [ GTK_ARROWS_BOTH ]          Indicates where scroll arrows should be placed.
   GtkMenu             :: arrow-scaling                    = 0.5               # [             0.7 ] ( 0.1  ) Arbitrary constant to scale down the size of the scroll arrow.
@@ -98,15 +102,9 @@ style "default" = "medium_text"
   GtkTreeView         :: horizontal-separator             = 8                 # [               2 ] ( >= 0 ) Horizontal space between cells. Must be an even number.
   GtkTreeView         :: vertical-separator               = 2                 # [               2 ] ( >= 0 ) Vertical space between cells. Must be an even number.
 
-  GtkEntry            :: honors-transparent-bg-hint       = 1                 # [               0 ] ( bool ) (Clearlooks) Without this, gecko will fill in the background of the entry.
-  GtkEntry            :: cursor-color = @fg_selected
-
-  #GtkToolbar::shadow_type = GTK_SHADOW_ETCHED_IN
-
-  #xthickness = 0
-  #ythickness = 0
-
-#Base Colors
+  GtkEntry::cursor_color = @entry_cursor
+  GtkEntry::state-hint = 0
+  
   bg[NORMAL]          = @background
   bg[PRELIGHT]        = shade(1.1, @background)
   bg[ACTIVE]          = shade(0.9, @background)
@@ -119,33 +117,95 @@ style "default" = "medium_text"
   fg[INSENSITIVE]     = shade(0.7, @background)
   fg[SELECTED]        = @fg_selected
 
+  # These base and text colors will be used by treeviews and some other widgets.
+
   base[NORMAL]        = @bases
   base[PRELIGHT]      = @bases
   base[INSENSITIVE]   = shade(1.0, @background)
-  base[ACTIVE]        = shade(0.9, @bg_selected)
-  base[SELECTED]      = @bg_selected
+  base[ACTIVE]        = shade(0.9, @bg_selected) /* base for focused, selected text */
+  base[SELECTED]      = @bg_selected /* base for non-focused, selected text */
 
   text[NORMAL]        = @texts
   text[PRELIGHT]      = @texts
-  text[ACTIVE]        = @fg_selected
   text[INSENSITIVE]   = shade(0.7, @lightest)
-  text[SELECTED]      = @fg_selected
+  text[ACTIVE]        = @fg_selected          /* text color for focused selected text */
+  text[SELECTED]      = @fg_selected          /* text color for non-focused selected text */
 
-#engine specific tweaks
+  #engine specific tweaks
 
-  engine "clearlooks" 
+  engine "clearlooks"
   {
-    #style              = GLOSSY
-    #colorize_scrollbar = TRUE
     menubarstyle       = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
-    #toolbarstyle       = 0 # 0 = flat, 1 = enable effects
   }
 }
 
+style "entry"
+{
+  GtkEntry::cursor_color = @entry_cursor
+  GtkEntry::inner-border = { 2, 2, 2, 2 }
+
+  xthickness = 0
+  ythickness = 0
+
+  # special base + text for GtkEntry to aid with visibility during text entry
+
+  base[NORMAL]      = @bases
+  base[PRELIGHT]    = @bases
+  base[INSENSITIVE] = shade(1.0, @background)
+  base[ACTIVE]      = @bases
+  base[SELECTED]    = @bg_selected
+
+  text[NORMAL]      = @texts
+  text[PRELIGHT]    = @texts
+  text[INSENSITIVE] = shade(0.7, @lightest)
+  text[ACTIVE]      = @texts
+  text[SELECTED]    = @fg_selected
+}
+
+style "spin_button" = "entry"
+{
+  engine "clearlooks"
+  {
+	# without this empty declaration, SpinButtons draw their arrows oddly
+  }
+
+}
+
+style "mixer_strip_entry" = "small_text"
+{
+        xthickness = 3
+        ythickness = 3
+
+	bg[NORMAL] = @bases
+	bg[ACTIVE] = @bases
+	bg[SELECTED] = @bases
+
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[SELECTED] = @texts
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	base[SELECTED] = @bases
+}
+
+style "peak_display_peaked_entry" = "mixer_strip_entry"
+{
+	fg[ACTIVE] = @texts
+	fg[SELECTED] = @texts
+	text[SELECTED] = @texts
+
+	base[NORMAL] = @clip_indicator
+	base[ACTIVE] = @clip_indicator
+	base[PRELIGHT] = @clip_indicator
+	base[INSENSITIVE] = @clip_indicator
+	base[SELECTED] = @clip_indicator
+}
+
 style "treeview_parent_node"
 {
 	# specifies *just* the color used for whole file rows when not selected
-	
+
 	fg[NORMAL] = { 0.0, 0.6, 0.85 }
 }
 
@@ -154,7 +214,7 @@ style "treeview_display" = "small_bold_text"
 	GtkWidget::focus-line-width = 0
 
 	# expander arrow border and DnD "icon" text
-	fg[NORMAL] = { 0.8, 0.8, 0.8 } 
+	fg[NORMAL] = { 0.8, 0.8, 0.8 }
 
 	bg[NORMAL] = { 0.8, 0.8, 0.8 }
 
@@ -163,7 +223,7 @@ style "treeview_display" = "small_bold_text"
 	base[NORMAL] = { 0.20, 0.20, 0.25 }
 
 	# selected row bg when window does not have focus (including during DnD)
-	base[ACTIVE] = { 0.0, 0.75, 0.75 }    
+	base[ACTIVE] = { 0.0, 0.75, 0.75 }
 
 	# selected row bg when window has focus
 	base[SELECTED] = { 0, 0.75, 0.75 }
@@ -172,14 +232,14 @@ style "treeview_display" = "small_bold_text"
 	text[NORMAL] = { 0.80, 0.80, 0.80 }
 
 	# selected row text with window focus
-	text[SELECTED] = { 1.0, 1.0, 1.0 }  
+	text[SELECTED] = { 1.0, 1.0, 1.0 }
 
 	# selected row text without window focus (including during DnD)
-	text[ACTIVE] = { 1.0, 1.0, 1.0 }  
+	text[ACTIVE] = { 1.0, 1.0, 1.0 }
 }
 
 style "track_header_inactive"  = "larger_text"
-{     
+{
         bg[NORMAL] =      @track_header_inactive
 	bg[ACTIVE] =      @track_header_inactive
 	bg[INSENSITIVE] = @track_header_inactive
@@ -205,35 +265,34 @@ style "automation_track_header"
 	bg[PRELIGHT] = @automation_track_header
 }
 
-
 style "inspector_processor_list" = "processor_list"
 {
- 	base[SELECTED] = { 0.3, 0.3, 0.3 }
+	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
-style "time_info_box" 
+style "time_info_box"
 {
-        bg[NORMAL] = { 0.05, 0.05, 0.05 }
+        bg[NORMAL] = { 0.00, 0.00, 0.00 }
 }
 
-style "status_bar_box" 
+style "status_bar_box"
 {
-        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+        bg[NORMAL] = @background
 }
 
 style "very_small_text"
 {
- 	font_name = "@FONT_SMALLER@"
+	font_name = "@FONT_SMALLER@"
 }
 
 style "small_text"
 {
- 	font_name = "@FONT_SMALL@"
+	font_name = "@FONT_SMALL@"
 }
 
-style "small_mono_text"
+style "small_clock"
 {
-	font_name = "@MONOSPACE@ @FONT_SMALLER@"
+	font_name = "@CLOCKFONT@ @FONT_NORMAL@"
 }
 
 style "small_italic_text"
@@ -243,17 +302,17 @@ style "small_italic_text"
 
 style "small_bold_text"
 {
- 	font_name = "bold @FONT_SMALL@"
+	font_name = "bold @FONT_SMALL@"
 }
 
 style "medium_bold_text"
 {
- 	font_name = "bold @FONT_NORMAL@"
+	font_name = "bold @FONT_NORMAL@"
 }
 
 style "medium_text"
 {
- 	font_name = "@FONT_NORMAL@"
+	font_name = "@FONT_NORMAL@"
 }
 
 style "medium_monospace_text"
@@ -262,7 +321,7 @@ style "medium_monospace_text"
 }
 
 style "red_medium_text" = "medium_text"
-{	
+{
 	fg[NORMAL] = @bright_indicator
 	fg[ACTIVE] = @bright_indicator
 	fg[SELECTED] = @bright_indicator
@@ -270,7 +329,7 @@ style "red_medium_text" = "medium_text"
 
 style "large_bold_text"
 {
- 	font_name = "bold @FONT_LARGE@"
+	font_name = "bold @FONT_LARGE@"
 }
 
 style "big_text"
@@ -278,19 +337,19 @@ style "big_text"
         font_name = "@FONT_BIG@"
 }
 
-style "bigger_mono_text"
+style "bigger_clock"
 {
-	font_name = "@MONOSPACE@ @FONT_BIGGER@"
+	font_name = "@CLOCKFONT@ @FONT_BIGGER@"
 }
 
 style "larger_text"
 {
- 	font_name = "@FONT_LARGE@"
+	font_name = "@FONT_LARGE@"
 }
 
-style "monospace massive_text"
+style "massive_clock"
 {
-	font_name = "@MONOSPACE@ bold @FONT_MASSIVE@"
+	font_name = "@CLOCKFONT@ bold @FONT_MASSIVE@"
 }
 
 style "big_bold_text"
@@ -316,19 +375,23 @@ style "marker_text" = "small text"
 {
 }
 
+style "text_on_bg" = "medium_text"
+{
+	base[NORMAL] = @background
+}
+
 style "midi_tracer_textview" = "medium_monospace_text"
 {
-	
+
 }
 
 style "time_axis_view_item_name" = "very small text"
 {
 }
 
-
 style "midi_tracer_textview" = "medium_monospace_text"
 {
-	
+
 }
 
 style "time_axis_view_item_name" = "very small text"
@@ -350,6 +413,20 @@ style "base_frame"
 	bg[NORMAL] = @background
 }
 
+style "text_highlight_frame"
+{
+	fg[NORMAL] = shade (0.4, @texts)
+	bg[NORMAL] = shade (0.4, @texts)
+}
+
+style "transport_frame"
+{
+}
+
+style "editor_window"
+{
+}
+
 style "transport_base" = "medium_bold_text"
 {
 }
@@ -437,7 +514,7 @@ style "processor" = "small_text"
 {
 }
 
-style "ruler_label" = "small_bold_text"
+style "ruler_label" = "small_text"
 {
 	fg[NORMAL] = @light_text_on_dark
 }
@@ -501,6 +578,14 @@ style "option_entry"  = "default"
 
 }
 
+style "font_scale_slider" = "default"
+{
+  # scale-marks are based on style->dark/light,
+	# which cannot be specified directly in the gtkrc.
+	# this is a quick hack to increase visibility of the marks
+  bg[NORMAL] = shade(1.4, @background)
+}
+
 style "very_small_bright_when_active" = "very_small_text"
 {
 	fg[NORMAL] = @foreground
@@ -542,7 +627,6 @@ style "fatal_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "error_message" = "medium_text"
@@ -552,7 +636,6 @@ style "error_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "info_message" = "medium_text"
@@ -562,7 +645,6 @@ style "info_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "warning_message" = "medium_text"
@@ -572,7 +654,6 @@ style "warning_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "medium_entry" = "medium_text"
@@ -611,39 +692,17 @@ style "medium_bold_entry"  = "medium_bold_text"
 	fg[NORMAL] = @texts
 	fg[ACTIVE] = @contrasting_indicator
 	fg[SELECTED] = @fg_selected
-	
-	text[NORMAL] = @texts
-	text[ACTIVE] = @texts
-	text[SELECTED] = @fg_selected
-
-	bg[NORMAL] = @bases
-	bg[SELECTED] = @bases
-	bg[SELECTED] = @bases
-	
-	base[NORMAL] = @bases
-	base[ACTIVE] = @bases
-	base[SELECTED] = @bg_selected
-}
-
-style "small_entry" = "small_text"
-{
-	xthickness = 3
-	ythickness = 3
-	fg[NORMAL] = @texts
-	fg[ACTIVE] = @contrasting_indicator
-	fg[SELECTED] = @fg_selected
 
 	text[NORMAL] = @texts
 	text[ACTIVE] = @texts
 	text[SELECTED] = @fg_selected
 
 	bg[NORMAL] = @bases
-	bg[ACTIVE] = @bases
 	bg[SELECTED] = @bases
 
 	base[NORMAL] = @bases
 	base[ACTIVE] = @bases
-	base[SELECTED] = @bases
+	base[SELECTED] = @bg_selected
 }
 
 style "small_spinner" = "small_text"
@@ -663,13 +722,6 @@ style "small_spinner" = "small_text"
 	base[SELECTED] = @background
 }
 
-style "red_active_small_entry" = "small_entry"
-{
-	fg[ACTIVE] = @texts
-	fg[SELECTED] = @texts
-	text[SELECTED] = @texts
-}
-
 style "small_red_on_black_entry"  = "small_bold_text"
 {
 	fg[NORMAL] = @bright_indicator
@@ -717,6 +769,21 @@ style "audio_track_base" = "default"
 	bg[SELECTED] = @background
 }
 
+style "control_master_base" = "default"
+{
+	font_name = " 8"
+	# NORMAL is used for single-data type labels, or Audio
+	# ACTIVE is used for MIDI in the presence of multiple data type
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = darker(@foreground)
+
+	bg[NORMAL] = @control_master
+	bg[ACTIVE] = @background
+	bg[PRELIGHT] = @background
+	bg[INSENSITIVE] = @background
+	bg[SELECTED] = @background
+}
+
 style "midi_track_base" = "default"
 {
 	font_name = " 8"
@@ -785,25 +852,10 @@ style "audio_bus_metrics_inactive" = "track_controls_inactive"
 	font_name = ""
 }
 
-style "track_name_display" = "medium_text"
+style "track_name_editor" = "medium_text"
 {
 	xthickness = 0
 	ythickness = 0
-	fg[NORMAL] = @foreground
-	fg[ACTIVE] = @foreground
-	fg[SELECTED] = @foreground
-
-	text[NORMAL] = @foreground
-	text[ACTIVE] = @foreground
-	text[SELECTED] = @foreground
-
-	base[NORMAL] = @bases
-	base[ACTIVE] = lighter(@bases)
-	base[SELECTED] = @bg_selected
-
-	bg[NORMAL] = lighter(@bases)
-	bg[ACTIVE] = lighter(@bases)
-	bg[SELECTED] = lighter(@bases)
 }
 
 style "track_separator"
@@ -901,19 +953,6 @@ style "paler_bright_when_active" = "medium_text"
 	bg[ACTIVE] = lighter(@bright_indicator)
 }
 
-style "peak_display_peaked_entry" = "small_entry"
-{
-	fg[ACTIVE] = @texts
-	fg[SELECTED] = @texts
-	text[SELECTED] = @texts
-
-	base[NORMAL] = @bright_indicator
-	base[ACTIVE] = @bright_indicator
-	base[PRELIGHT] = @bright_indicator
-	base[INSENSITIVE] = @bright_indicator
-	base[SELECTED] = @bright_indicator
-}
-
 style "selected_strip_frame"
 {
 	fg[NORMAL] = @bright_indicator
@@ -945,7 +984,7 @@ style "sync_alert"
 	bg[PRELIGHT] = @somewhat_bright_indicator
 	bg[SELECTED] = @somewhat_bright_indicator
 	bg[NORMAL] = @somewhat_bright_indicator
-	
+
 	fg[NORMAL] = @darkest
 	fg[PRELIGHT] = @darkest
 	fg[SELECTED] = @darkest
@@ -965,18 +1004,12 @@ style "location_row_button" = "default_button"
 	font_name = " 10"
 }
 
-
 style "ardour_button" ="default_button"
 {
 	xthickness = 1
 	ythickness = 1
 }
 
-style "padded_button" = "default_button"
-{
-	xthickness = 8
-}
-
 style "tooltip" = "medium_text"
 {
 	fg[NORMAL] = @fg_tooltip
@@ -1011,7 +1044,23 @@ style "settings_notebook" = "big_text"
 {
 
 }
+
+style "pane"
+{
+      fg[NORMAL] = lighter(@background)
+      fg[SELECTED] = @foreground
+      fg[ACTIVE] = @somewhat_bright_indicator
+}
+
+style "vca_label_bar" = "medium_bold_text"
+{
+	bg[NORMAL] = @darkest
+	fg[NORMAL] = @lightest
+}
+
 class "GtkWidget" style:highest "default"
+class "GtkSpinButton" style:highest "spin_button"
+class "GtkEntry" style "entry"                          # not :highest to allow instances to override this
 class "GtkScrollbar" style:highest "ardour_adjusters"
 class "GtkLabel" style:highest "default_generic"
 class "GtkButton" style:highest "ardour_button"
@@ -1019,8 +1068,6 @@ class "GtkCheckButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
-
-widget "*PaddedButton" style:highest "padded_button"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
 widget "*ArdourContextMenu*" style:highest "default_menu"
@@ -1031,6 +1078,7 @@ widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
 widget "*OptionsNotebook" style:highest "preferences"
 widget "*OptionsLabel" style:highest "preferences"
 widget "*OptionsEntry" style:highest "option_entry"
+widget "*FontScaleSlider" style:highest "font_scale_slider"
 widget "*InspectorNotebook" style:highest "preferences"
 widget "*EditorRulerLabel*" style:highest "ruler_label"
 widget "*MixerAutomationModeButton*" style:highest "very_small_button"
@@ -1038,27 +1086,32 @@ widget "*MixerAutomationModeButton.*" style:highest "very_small_button"
 widget "*MixerAutomationPlaybackButton*" style:highest "very_small_button"
 widget "*MixerAutomationPlaybackButton.*" style:highest "very_small_button"
 widget "*ShuttleControl" style:highest "shuttle_control"
-#widget "*MainMenuBar" style:highest "menu_bar_base"
 widget "*ErrorMessage" style:highest "error_message"
 widget "*FatalMessage" style:highest "fatal_message"
 widget "*InfoMessage" style:highest "info_message"
 widget "*WarningMessage" style:highest "warning_message"
 
-widget "*big clock" style:highest "monospace massive_text"
-widget "*selection clock" style:highest "small_mono_text"
-widget "*punch clock" style:highest "small_mono_text"
-widget "*transport clock" style:highest "bigger_mono_text"
-widget "*secondary clock" style:highest "bigger_mono_text"
-widget "*transport delta clock" style:highest "bigger_mono_text"
-widget "*secondary delta clock" style:highest "bigger_mono_text"
+widget "*big clock" style:highest "massive_clock"
+widget "*selection clock" style:highest "small_clock"
+widget "*punch clock" style:highest "small_clock"
+widget "*transport clock" style:highest "bigger_clock"
+widget "*secondary clock" style:highest "bigger_clock"
+widget "*transport delta clock" style:highest "bigger_clock"
+widget "*secondary delta clock" style:highest "bigger_clock"
+widget "*stretch clock" style:highest "bigger_clock"
 widget "*silence duration clock" style:highest "medium_text"
 widget "*edit point clock" style:highest "medium_text"
-widget "*nudge clock" style:highest "small_mono_text"
+widget "*nudge clock" style:highest "small_clock"
 widget "*menubar clock" style:highest "medium_text"
 widget "*zoomrange clock" style:highest "medium_text"
 widget "*timecodeoffset clock" style:highest "medium_text"
 
 widget "*BaseFrame" style:highest "base_frame"
+widget "*TextHighlightFrame" style:highest "text_highlight_frame"
+widget "*TransportFrame" style:highest "transport_frame"
+widget "*TransportFrame*" style:highest  "transport_frame"
+widget "*EditorWindow*" style:highest  "editor_window"
+widget "*EditorWindow" style:highest  "editor_window"
 
 widget "*SendStripBase" style:highest "send_strip_base"
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
@@ -1087,6 +1140,7 @@ widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inacti
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
 widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
+widget "*ControlMasterBaseUnselected" style:highest "control_master_base"
 
 widget "*SendUIFader" style:highest "plugin_slider"
 widget "*ReturnUIFader" style:highest "plugin_slider"
@@ -1097,11 +1151,8 @@ widget "*AudioBusFader" style:highest "audio_bus_fader"
 
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
 widget "*TrackSeparator" style:highest "track_separator"
-widget "*EditorTrackNameDisplay" style:highest "track_name_display"
-widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
-widget "*CrossfadeEditAuditionButton" style:highest "bright_when_active"
+widget "*TrackNameEditor*" style:highest "track_name_editor"
 widget "*CrossfadeEditAuditionButton*" style:highest "bright_when_active"
-widget "*CrossfadeEditCurveButton" style:highest "bright_when_active"
 widget "*CrossfadeEditCurveButton*" style:highest "bright_when_active"
 widget "*CrossfadeEditFrame" style:highest "base_frame"
 widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_header_inactive"
@@ -1113,11 +1164,9 @@ widget "*MidiTrackControlsBaseSelected" style:highest "track_header_selected"
 widget "*BusControlsBaseSelected" style:highest "track_header_selected"
 widget "*AutomationTrackControlsBase" style:highest "automation_track_header"
 widget "*AutomationTrackControlsBaseSelected" style:highest "track_header_selected"
+widget "*ControlMasterBaseSelected" style:highest "track_header_selected"
 widget "*PluginParameterLabel" style:highest "medium_text"
-widget "*MotionControllerValue" style:highest "small_entry"
-widget "*MotionControllerValue*" style:highest "small_entry"
 widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox" style:highest "medium_bold_entry"
 widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
 widget "*ProcessorControlSlider" style:highest "processor_control_slider"
 widget "*processor control button" style:highest "processor_control_button"
@@ -1127,64 +1176,53 @@ widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"
-widget "*MixerStripGainDisplay" style:highest "small_entry"
-widget "*MixerStripGainDisplay*" style:highest "small_entry"
-widget "*MixerStripPeakDisplay" style:highest "red_active_small_entry"
-widget "*MixerStripPeakDisplay*" style:highest "red_active_small_entry"
-widget "*MixerStripPeakDisplayPeak*" style:highest "peak_display_peaked_entry"
+widget "*MixerStripGainDisplay" style:highest "mixer_strip_entry"
+widget "*MixerStripPeakDisplay" style:highest "mixer_strip_entry"
+widget "*MixerStripPeakDisplayPeak" style:highest "peak_display_peaked_entry"
 widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame"
 widget "*MixerStripFrame" style:highest "base_frame"
-widget "*FadeCurve" style:highest "medium_bold_entry"
 widget "*FadeCurve*" style:highest "medium_bold_entry"
 widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
 widget "*TearOffArrow" style:highest "tearoff_arrow"
 widget "*RouteParamsTitleLabel" style:highest "medium_text"
-widget "*PluginAutomateButton" style:highest "small_button"
-widget "*PluginAutomateButton*" style:highest "small_button"
-widget "*PluginSaveButton" style:highest "small_button"
+widget "*plugin automation state button*" style:highest "small_button"
 widget "*PluginSaveButton*" style:highest "small_button"
 widget "*PluginEditorButton*" style:highest "default_toggle_button"
 widget "*PluginEditorButton-active" style:highest "default_toggle_button_active"
+widget "*PluginAnalysisInfoLabel" style:highest "medium_monospace_text"
 
-widget "*BarControlSpinner" style:highest "small_spinner"
 widget "*BarControlSpinner*" style:highest "small_spinner"
 
 widget "*BlackSeparator" style:highest "black_separator"
 
 widget "*MetricLabel" style:highest "medium_text"
 widget "*ChoiceWindow" style:highest "default_generic"
-widget "*TrackLabel" style:highest "medium_text"
 widget "*TrackParameterName" style:highest "small_italic_text"
 widget "*AddRouteDialog*" style:highest "medium_text"
-widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
 widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
 widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
 widget "*NewSessionSR1Label" style:highest "red_medium_text"
 widget "*NewSessionSR2Label" style:highest "medium_text"
 widget "*location edit row clock" style:highest "medium_text"
+widget "*ArdourLuaEntry" style:highest "medium_monospace_text"
 widget "*LocationEditNameLabel" style:highest "medium_text"
-widget "*LocationEditCdButton" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditCdButton*" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditHideButton" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditHideButton*" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditLockButton*" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditGlueButton*" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditNumberLabel" style:highest "small_text"
 widget "*LocationEditNameEntry" style:highest "option_entry"
-widget "*LocationAddLocationButton" style:highest "default_button"
 widget "*LocationAddLocationButton*" style:highest "default_button"
-widget "*LocationAddRangeButton" style:highest "default_button"
 widget "*LocationAddRangeButton*" style:highest "default_button"
-widget "*LocationEditRemoveButton" style:highest "location_row_button"
 widget "*LocationEditRemoveButton*" style:highest "location_row_button"
 widget "*ChannelCountSelector" style:highest "medium_bold_entry"
 widget "*RegionListWholeFile" style:highest "treeview_parent_node"
 widget "*ProcessorList*" style:highest "processor_list"
 widget "*PortMatrixLabel*" style:highest "small_text"
+widget "*MainMenuBar" style:highest "status_bar_box"
 widget "*midi device" style:highest "midi_device"
 widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
 widget "*meterbridge label" style:highest "meterbridge_label"
-widget "*ContrastingPopup" style:highest "contrasting_popup"
 widget "*ContrastingPopup*" style:highest "contrasting_popup"
 widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
 widget "*TimeInfoSelectionTitle" style:highest "small_text"
@@ -1200,3 +1238,7 @@ widget "*processor fader" style:highest "processor"
 widget "*processor postfader" style:highest "processor"
 widget "*MonitorSectionLabel" style:highest "small_text"
 widget "*ooltip*" style:highest "tooltip"
+widget "*Pane" style:highest "pane"
+widget "*Pane.Divider" style:highest "pane"
+widget "*VCALabelBar*" style:highest "vca_label_bar"
+widget "*TextOnBackground" style:highest "text_on_bg"