diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 03d506c4b..7c3e6e74d 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-05  Seth Nickell  <snickell@stanford.edu>
+
+	* gnome-theme-manager.c: (setup_dialog), (main):
+	* Makefile.am:
+	* theme-thumbnailing.png:
+
+	Add a default image for when theme's are being
+	thumbnailed.
+	
+	* theme-properties.glade:
+
+	Hide dialog by default so it doesn't come
+	up undrawn.
+	
 2003-01-05  Seth Nickell  <snickell@stanford.edu>
 
 	* gnome-theme-manager.c: (add_custom_row_to_meta_theme),
diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am
index 2e2a881f6..acb9b40ae 100644
--- a/capplets/theme-switcher/Makefile.am
+++ b/capplets/theme-switcher/Makefile.am
@@ -1,5 +1,9 @@
 bin_PROGRAMS = gnome-theme-manager
 
+pixmapdir = $(GNOMECC_PIXMAPS_DIR)
+pixmap_DATA = \
+	theme-thumbnailing.png
+
 gnome_theme_manager_LDADD = 						\
 	$(GNOMECC_CAPPLETS_LIBS) 					\
 	$(METACITY_LIBS)						\
diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c
index c29e4e3ff..1945bf682 100644
--- a/capplets/theme-switcher/gnome-theme-manager.c
+++ b/capplets/theme-switcher/gnome-theme-manager.c
@@ -930,6 +930,7 @@ setup_dialog (GladeXML *dialog)
 
   client = gconf_client_get_default ();
   window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
+  
   parent = WID ("theme_dialog");
 
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -989,8 +990,12 @@ setup_dialog (GladeXML *dialog)
   g_signal_connect (G_OBJECT (parent), "drag-leave", G_CALLBACK (gnome_theme_manager_drag_leave_cb), NULL);
   g_signal_connect (G_OBJECT (parent), "drag-data-received",G_CALLBACK (gnome_theme_manager_drag_data_received_cb), NULL);
 
+  default_image = gdk_pixbuf_new_from_file(GNOMECC_DATA_DIR "/pixmaps/theme-thumbnailing.png", NULL);
+
   capplet_set_icon (parent, "gnome-ccthemes.png");
+
   gtk_widget_show (parent);
+
 }
 
 /* Non static functions */
@@ -1209,6 +1214,7 @@ main (int argc, char *argv[])
   activate_settings_daemon ();
 
   dialog = gnome_theme_manager_get_theme_dialog ();
+
   setup_dialog (dialog);
 
   gtk_main ();
diff --git a/capplets/theme-switcher/theme-properties.glade b/capplets/theme-switcher/theme-properties.glade
index 8ab2c1c8f..7ba23bdb5 100644
--- a/capplets/theme-switcher/theme-properties.glade
+++ b/capplets/theme-switcher/theme-properties.glade
@@ -4,7 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="theme_dialog">
-  <property name="visible">True</property>
+  <property name="visible">False</property>
   <property name="title" translatable="yes">Theme Preferences</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
diff --git a/capplets/theme-switcher/theme-thumbnailing.png b/capplets/theme-switcher/theme-thumbnailing.png
new file mode 100644
index 000000000..b4a3f754e
Binary files /dev/null and b/capplets/theme-switcher/theme-thumbnailing.png differ