diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 6785ba54e..b882a626d 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-27  Seth Nickell  <snickell@stanford.edu>
+
+	* gtk-theme-selector.desktop.in:
+
+	Change name, move out of Advanced category.
+	
+	* theme-properties.glade:
+
+	Tweak padding / spacing.
+
+	* gtk-theme-selector.desktop.in.in:
+
+	Old cruft file, delete.
+	
 2002-04-26  Seth Nickell  <snickell@stanford.edu>
 
 	* Makefile.am:
diff --git a/capplets/theme-switcher/gtk-theme-selector.desktop.in b/capplets/theme-switcher/gtk-theme-selector.desktop.in
index 3b7e5cbba..e144ae964 100644
--- a/capplets/theme-switcher/gtk-theme-selector.desktop.in
+++ b/capplets/theme-switcher/gtk-theme-selector.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
-_Name=Gtk+ Theme Selector
-_Comment=Select which gtk+ theme to use
-Exec=gnome-font-and-theme-properties
+_Name=Theme
+_Comment=Change the appearance of buttons, scrollbars, etc
+Exec=gnome-theme-properties
 Icon=gnome-ccthemes.png
 Terminal=0
 Type=Application
-Categories=Application;Settings;AdvancedSettings;
+Categories=Application;Settings;
diff --git a/capplets/theme-switcher/gtk-theme-selector.desktop.in.in b/capplets/theme-switcher/gtk-theme-selector.desktop.in.in
deleted file mode 100644
index 89657de72..000000000
--- a/capplets/theme-switcher/gtk-theme-selector.desktop.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Gtk+ Theme Selector
-_Comment=Select which gtk+ theme to use
-Exec=gtk2-theme-selector-capplet
-Icon=gnome-ccthemes.png
-Terminal=0
-Type=Application
diff --git a/capplets/theme-switcher/theme-properties.glade b/capplets/theme-switcher/theme-properties.glade
index 3d2a1d240..155e08cb9 100644
--- a/capplets/theme-switcher/theme-properties.glade
+++ b/capplets/theme-switcher/theme-properties.glade
@@ -15,7 +15,6 @@
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="border_width">2</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -61,20 +60,22 @@
 
       <child>
 	<widget class="GtkFrame" id="theme_frame">
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="label_xalign">0</property>
 	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox1">
-	      <property name="border_width">4</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">4</property>
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="theme_swindow">
+		  <property name="width_request">225</property>
+		  <property name="height_request">100</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
@@ -105,7 +106,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label1">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Available themes</property>
+	      <property name="label" translatable="yes">Themes</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>