Index: gtk2_ardour/audio_time_axis.cc
===================================================================
--- gtk2_ardour/audio_time_axis.cc	(revision 1560)
+++ gtk2_ardour/audio_time_axis.cc	(working copy)
@@ -107,21 +107,13 @@
 	
 	_route->panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans));
 
+	update_control_names ();
+
 	if (is_audio_track()) {
 
-		controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
-		controls_base_selected_name = "AudioTrackControlsBaseSelected";
-		controls_base_unselected_name = "AudioTrackControlsBaseUnselected";
-
 		/* ask for notifications of any new RegionViews */
 		_view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added));
 		_view->attach ();
-
-	} else { /* bus */
-
-		controls_ebox.set_name ("AudioBusControlsBaseUnselected");
-		controls_base_selected_name = "AudioBusControlsBaseSelected";
-		controls_base_unselected_name = "AudioBusControlsBaseUnselected";
 	}
 
 	post_construct ();
@@ -621,7 +613,19 @@
 AudioTimeAxisView::route_active_changed ()
 {
 	RouteTimeAxisView::route_active_changed ();
+	update_control_names ();
+}
 
+
+/**
+ *    Set up the names of the controls so that they are coloured
+ *    correctly depending on whether this route is inactive or
+ *    selected.
+ */
+
+void
+AudioTimeAxisView::update_control_names ()
+{
 	if (is_audio_track()) {
 		if (_route->active()) {
 			controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
Index: gtk2_ardour/audio_time_axis.h
===================================================================
--- gtk2_ardour/audio_time_axis.h	(revision 1560)
+++ gtk2_ardour/audio_time_axis.h	(working copy)
@@ -114,6 +114,7 @@
 	void pan_hidden ();
 
 	void update_pans ();
+	void update_control_names ();
 
 	AutomationTimeAxisView* gain_track;
 	AutomationTimeAxisView* pan_track;