diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index cc514890fc..db01ef384b 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -1,8 +1,8 @@
-cWaveForm 0.0 0.0 0.0 0.80
+cWaveForm 0.50 1.0 1.0 0.90
 cMutedWaveForm 0.35 0.35 0.35 1.0
-cSelectedFrameBase 0.71 0.57 0.66 1.0
-cFrameBase 0.75 0.75 0.76 1.0
-cAudioTrackBase 0.79 0.80 0.85 0.41
+cSelectedFrameBase 0.63 0.13 0.94 0.2
+cFrameBase 0.0 0.0 0.0 0.25
+cAudioTrackBase 0.30 0.30 0.30 0.25
 cAudioTrackOutline 0.00 0.00 0.00 1.00
 cAudioBusBase 0.90 0.82 0.90 0.41
 cTempoBar 0.64 0.64 0.66 1.0
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 929a1b5a06..d48f266b45 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -667,8 +667,12 @@ style "track_list_display" = "small_bold_text"
  	base[SELECTED] = { 0, 0, 0 }
 }
 
-style "redirect_list_display" = "small_bold_text"
+style "redirect_list_display"
 {
+	GtkTreeView::horizontal-separator = 0
+	GtkTreeView::vertical-separator = 0
+
+	font_name = "sans 7"
 	text[NORMAL] = { 0.80, 0.80, 0.80 }
  	text[ACTIVE] = { 0.0, 0.0, 0.9 }
  	text[INSENSITIVE] = { 0, 0, 0 }
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index ea43d76745..15442bbaeb 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -741,33 +741,24 @@ RedirectBox::idle_delete_redirect (Redirect *redirect)
 void
 RedirectBox::rename_redirect (Redirect* redirect)
 {
-	ArdourDialog dialog (_("ardour: rename redirect"), true);
-	Entry  entry;
-	VBox   vbox;
-	HBox   hbox;
-	Button ok_button (_("OK"));
-	Button cancel_button (_("Cancel"));
+	ArdourPrompter name_prompter (true);
+	string result;
+	name_prompter.set_prompt (_("rename redirect"));
+	name_prompter.set_initial_text (redirect->name());
+	name_prompter.show_all ();
 
-	dialog.set_name ("RedirectRenameWindow");
-	dialog.set_size_request (300, -1);
-	dialog.set_position (Gtk::WIN_POS_MOUSE);
+	switch (name_prompter.run ()) {
 
-	dialog.add_action_widget (entry, RESPONSE_ACCEPT);
-	dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
-	dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
-	
-	entry.set_name ("RedirectNameDisplay");
-	entry.set_text (redirect->name());
-	entry.select_region (0, -1);
-	entry.grab_focus ();
-
-	switch (dialog.run ()) {
-	case RESPONSE_ACCEPT:
-		redirect->set_name (entry.get_text(), this);
-		break;
-	default:
+	case Gtk::RESPONSE_ACCEPT:
+        name_prompter.get_result (result);
+        if (result.length()) {
+			redirect->set_name (result, this);
+		}	
 		break;
 	}
+
+	return;
+  
 }
 
 void