diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index e5ec742ac7..07706a11c5 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -374,7 +374,7 @@ style "medium_entry_noselection_fg" = "medium_entry"
 
 style "medium_entry_noselection_bg" = "medium_entry"
 {
-	bg[SELECTED] = { 0, 0, 0 }
+	bg[SELECTED] = { 0.50, 1.0, 1.0 }
 }
 
 style "medium_bold_entry"  = "medium_bold_text"
@@ -825,6 +825,11 @@ style "region_list_whole_file"
 	fg[NORMAL] = { 0.4, 0.4, 0.9 }
 }
 
+style "ardour_button" ="default_buttons_menus"
+{
+	xthickness = 0
+	ythickness = 2
+}
 
 #---------------------------------------------------------------
 widget "*FirstActionMessage" style "first_action_message"
@@ -1167,7 +1172,7 @@ widget "*RegionListWholeFile" style "region_list_whole_file"
 class "GtkWidget" style "default_base"
 class "GtkScrollbar" style "ardour_adjusters"
 class "GtkLabel" style "default_buttons_menus"
-class "GtkButton" style "default_buttons_menus"
+class "GtkButton" style "ardour_button"
 class "GtkArrow" style "tearoff_arrow"
 class "GtkProgressBar" style "ardour_progressbars"
 
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index cad9edad8f..31de01916a 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -310,7 +310,7 @@ ARDOUR::get_user_ardour_path ()
 	}
 		
 	path = envvar;
-	path += "/.ardour/";
+	path += "/.ardour2/";
 
 	/* create it if necessary */
 
@@ -325,7 +325,7 @@ ARDOUR::get_system_ardour_path ()
 	string path;
 
 	path += DATA_DIR;
-	path += "/ardour/";
+	path += "/ardour2/";
 	
 	return path;
 }
@@ -370,7 +370,7 @@ find_file (string name, string dir, string subdir = "")
 	/* C: dir/... */
 	
 	path = dir;
-	path += "/ardour/";
+	path += "/ardour2/";
 	
 	if (subdir.length()) {
 		path += subdir + "/";