diff --git a/gtk2_ardour/ardour2_ui_dark.rc b/gtk2_ardour/ardour2_ui_dark.rc
index d16e8fbe20..29243d7d78 100644
--- a/gtk2_ardour/ardour2_ui_dark.rc
+++ b/gtk2_ardour/ardour2_ui_dark.rc
@@ -865,11 +865,11 @@ style "track_controls_inactive"
 
 style "edit_controls_base_selected"
 {
-	bg[NORMAL] = { 0.60, 0.54, 0.60 }
-	bg[ACTIVE] = { 0.60, 0.54, 0.60 }
-	bg[INSENSITIVE] = { 0.60, 0.54, 0.60 }
-	bg[SELECTED] = { 0.60, 0.54, 0.60 }
-	bg[PRELIGHT] = { 0.60, 0.54, 0.60 }
+	bg[NORMAL] = { 0.32, 0.32, 0.54 }
+	bg[ACTIVE] = { 0.32, 0.32, 0.54 }
+	bg[INSENSITIVE] = { 0.32, 0.32, 0.54 }
+	bg[SELECTED] = { 0.32, 0.32, 0.54 }
+	bg[PRELIGHT] = { 0.32, 0.32, 0.54 }
 }
 
 style "automation_track_controls_base"
@@ -1327,8 +1327,10 @@ widget "*FramesRuler" style:highest "editor_time_ruler"
 widget "*MinSecRuler" style:highest "editor_time_ruler"
 widget "*BaseFrame" style:highest "base_frame"
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
+widget "*MidiTrackStripBase" style:highest "midi_track_base"
 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 "*AudioBusStripBase" style:highest "audio_bus_base"
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
@@ -1363,8 +1365,10 @@ widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_i
 widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
 widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
+widget "*MidiTrackStripBaseInactive" style:highest "track_controls_inactive"
 widget "*AudioBusStripBaseInactive" 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"
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 9300986960..64b3ab4998 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -116,13 +116,12 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar
 		_view->RegionViewAdded.connect (mem_fun(*this, &MidiTimeAxisView::region_view_added));
 		_view->attach ();
 
-	} else { /* bus */
+	} /*else { // no MIDI busses yet
 
-		throw; // what the?
 		controls_ebox.set_name ("MidiBusControlsBaseUnselected");
 		controls_base_selected_name = "MidiBusControlsBaseSelected";
 		controls_base_unselected_name = "MidiBusControlsBaseUnselected";
-	}
+	}*/
 }
 
 MidiTimeAxisView::~MidiTimeAxisView ()
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2a3b045b27..94dbd1d727 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -256,7 +256,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (post_redirect_box, true, true);
-	global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+	if (!is_midi_track())
+		global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
@@ -324,7 +325,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	   in update_diskstream_display().
 	*/
 
-	set_name ("AudioTrackStripBase");
+	if (is_midi_track())
+		set_name ("MidiTrackStripBase");
+	else
+		set_name ("AudioTrackStripBase");
 
 	/* now force an update of all the various elements */
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index b33cb13a0d..5b9e927e81 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -76,10 +76,10 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
 
 	_route->active_changed.connect (mem_fun (*this, &RouteUI::route_active_changed));
 
-        mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name ));
+	mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name ));
 	mute_button->set_self_managed (true);
 
-        solo_button = manage (new BindableToggleButton (_route->solo_control(), s_name ));
+	solo_button = manage (new BindableToggleButton (_route->solo_control(), s_name ));
 	solo_button->set_self_managed (true);
 
 	mute_button->set_name ("MuteButton");