diff -Naur gnome-control-center (copia 5)/capplets/appearance/appearance.h gnome-control-center/capplets/appearance/appearance.h
--- gnome-control-center (copia 5)/capplets/appearance/appearance.h	2007-11-24 19:28:35.000000000 +0100
+++ gnome-control-center/capplets/appearance/appearance.h	2007-11-24 20:57:37.000000000 +0100
@@ -66,4 +66,7 @@
   GdkPixbuf *gtk_theme_icon;
   GdkPixbuf *window_theme_icon;
   GdkPixbuf *icon_theme_icon;
+  
+  /* color schemes key file */
+  GKeyFile *color_schemes_key_file;
 } AppearanceData;
diff -Naur gnome-control-center (copia 5)/capplets/appearance/appearance-style.c gnome-control-center/capplets/appearance/appearance-style.c
--- gnome-control-center (copia 5)/capplets/appearance/appearance-style.c	2007-11-24 19:28:35.000000000 +0100
+++ gnome-control-center/capplets/appearance/appearance-style.c	2007-11-25 15:13:13.000000000 +0100
@@ -28,9 +28,9 @@
 #include "theme-thumbnail.h"
 
 typedef void (* ThumbnailGenFunc) (void               *type,
-				   ThemeThumbnailFunc  theme,
-				   AppearanceData     *data,
-				   GDestroyNotify     *destroy);
+                   ThemeThumbnailFunc  theme,
+                   AppearanceData     *data,
+                   GDestroyNotify     *destroy);
 
 static const gchar *symbolic_names[NUM_SYMBOLIC_COLORS] = {
   "fg_color", "bg_color",
@@ -202,6 +202,134 @@
   g_free (setting);
 }
 
+static gboolean
+color_scheme_key_file_load (AppearanceData *data)
+{
+  gchar    *theme_name   = NULL;
+  gchar    *themes_dir   = NULL;
+  gchar    *schemes_path = NULL;
+  gboolean result        = FALSE;
+  
+  themes_dir = gtk_rc_get_theme_dir ();
+  theme_name = gconf_client_get_string (data->client, METACITY_THEME_KEY, NULL); 
+
+  schemes_path = g_build_filename (themes_dir, theme_name, "colorschemes.ini", NULL);
+
+  result = g_key_file_load_from_file (data->color_schemes_key_file, schemes_path, 
+                                      G_KEY_FILE_NONE, NULL);
+
+  g_free (theme_name);
+  g_free (themes_dir);
+  g_free (schemes_path);
+  
+  return result;
+}
+
+static GString *
+color_scheme_key_file_get_scheme (guint index, AppearanceData *data)
+{
+  guint       i, j;
+  gchar       *colorstr       = NULL;
+  gchar       **scheme_groups = NULL;
+  gchar       **color_keys    = NULL;
+  GString     *scheme = g_string_new (NULL);
+
+  scheme_groups = g_key_file_get_groups (data->color_schemes_key_file, NULL);
+  color_keys = g_key_file_get_keys (data->color_schemes_key_file, scheme_groups[index], 
+                                    NULL, NULL);
+  
+  /* generate a valid gconf color scheme */
+  for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i)
+  {
+    for (j = 0; color_keys[j]; ++j)  
+    {
+      if (strcmp (color_keys[j], symbolic_names[i]) == 0) 
+      {
+        colorstr = g_key_file_get_string (data->color_schemes_key_file, 
+                                          scheme_groups[index], color_keys[j], 
+                                          NULL);
+        g_string_append_printf (scheme, "%s:%s\n", color_keys[j], colorstr);
+        g_free (colorstr);
+        
+        break; /* disregard color redefinitions */
+      }
+    }
+  }
+    
+  g_strfreev (color_keys);
+  g_strfreev (scheme_groups);
+
+  if (scheme->str)
+    g_string_truncate (scheme, scheme->len - 1);
+    
+  return scheme;
+}
+
+static void
+color_scheme_combo_update (GtkSettings *settings, AppearanceData *data)
+{
+  guint       i;
+  gboolean    found           = FALSE;
+  gchar       **scheme_groups = NULL;
+  gchar       *scheme_name    = NULL;
+  gchar       *cur_scheme     = NULL;
+  gchar       *def_scheme     = NULL;
+  gchar       *theme_name     = NULL;
+  GtkComboBox *combo          = NULL;
+  GString     *scheme = g_string_new (NULL);
+
+  combo = GTK_COMBO_BOX (glade_xml_get_widget (data->xml, "color_scheme_combo"));
+  gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (combo)));
+        
+  gtk_combo_box_append_text (combo, "Default");
+
+  theme_name = gconf_client_get_string (data->client, METACITY_THEME_KEY, NULL);
+  def_scheme = gtkrc_get_color_scheme_for_theme (theme_name);  
+  g_object_get (settings, "gtk-color-scheme", &cur_scheme, NULL);
+  
+  if (theme_name && def_scheme && cur_scheme) 
+  {
+    /* default theme selection */
+    if (gnome_theme_color_scheme_equal (def_scheme, cur_scheme)) {
+      gtk_combo_box_set_active (combo, 0);
+      found = TRUE;
+    }
+    
+    /* update combo box with color scheme names from the file */
+    if (data->color_schemes_key_file) 
+    {
+      scheme_groups = g_key_file_get_groups (data->color_schemes_key_file, NULL);
+    
+      for (i = 0; scheme_groups[i]; ++i) 
+      {
+        scheme_name = g_key_file_get_locale_string (data->color_schemes_key_file, 
+                                                    scheme_groups[i], "Name", NULL, NULL);
+        if (scheme_name)
+          gtk_combo_box_append_text (combo, scheme_name);
+      
+        /* autoselect the current color scheme */
+        if (!found) {
+          scheme = color_scheme_key_file_get_scheme (i, data);
+          
+          if (gnome_theme_color_scheme_equal (cur_scheme, scheme->str)) {
+            gtk_combo_box_set_active (combo, i + 1);
+            found = TRUE;
+          }
+          
+          g_string_free (scheme, TRUE);
+        }
+        
+        g_free (scheme_name);
+      }
+    }
+  }
+  
+  g_free (def_scheme);
+  g_free (cur_scheme);
+  g_free (theme_name);
+  g_strfreev (scheme_groups);
+}
+
 static void
 color_scheme_changed (GObject    *settings,
                       GParamSpec *pspec,
@@ -274,7 +402,10 @@
 
   if (!gnome_theme_color_scheme_equal (old_scheme, scheme->str)) {
     gconf_client_set_string (data->client, COLOR_SCHEME_KEY, scheme->str, NULL);
-
+    
+    gtk_combo_box_set_active (GTK_COMBO_BOX (glade_xml_get_widget (data->xml, 
+                              "color_scheme_combo")), -1);
+                              
     gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), TRUE);
   }
   g_free (old_scheme);
@@ -282,9 +413,38 @@
 }
 
 static void
+color_scheme_combo_changed_cb (GtkWidget *combo, AppearanceData *data)
+{
+  gint    scheme_selected;
+  gchar   *old_scheme = NULL;
+  GString *scheme = g_string_new (NULL);
+  
+  if (data->color_schemes_key_file)
+  {
+    scheme_selected = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
+    
+    if (scheme_selected == 0) {    /* default */
+      gconf_client_unset (data->client, COLOR_SCHEME_KEY, NULL); 
+      
+    } else if (scheme_selected > 0) {
+      old_scheme = gconf_client_get_string (data->client, COLOR_SCHEME_KEY, NULL);
+      scheme = color_scheme_key_file_get_scheme (scheme_selected - 1, data);
+
+      if (!gnome_theme_color_scheme_equal (old_scheme, scheme->str))
+        gconf_client_set_string (data->client, COLOR_SCHEME_KEY, scheme->str, NULL);
+      
+      g_free (old_scheme);  
+      g_string_free (scheme, TRUE);
+    }
+  }
+}
+
+static void
 color_scheme_defaults_button_clicked_cb (GtkWidget *button, AppearanceData *data)
 {
-  gconf_client_unset (data->client, COLOR_SCHEME_KEY, NULL);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (glade_xml_get_widget (data->xml, 
+                            "color_scheme_combo")), 0);
+                            
   gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), FALSE);
 }
 
@@ -300,9 +460,9 @@
 
 static void
 gtk_theme_changed (GConfPropertyEditor *peditor,
-		   const gchar *key,
-		   const GConfValue *value,
-		   AppearanceData *data)
+           const gchar *key,
+           const GConfValue *value,
+           AppearanceData *data)
 {
   GnomeThemeInfo *theme = NULL;
   const gchar *name;
@@ -328,14 +488,24 @@
   }
 
   gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "gtk_themes_delete"),
-			    theme_is_writable (theme));
+                theme_is_writable (theme));
+                
+  /* Load the color scheme file and update the combo box */
+  data->color_schemes_key_file = g_key_file_new ();
+
+  if (color_scheme_key_file_load (data))
+    color_scheme_combo_update (settings, data);
+  else {
+    g_key_file_free (data->color_schemes_key_file);
+    data->color_schemes_key_file = NULL;
+  }
 }
 
 static void
 window_theme_changed (GConfPropertyEditor *peditor,
-		      const gchar *key,
-		      const GConfValue *value,
-		      AppearanceData *data)
+              const gchar *key,
+              const GConfValue *value,
+              AppearanceData *data)
 {
   GnomeThemeInfo *theme = NULL;
   const gchar *name;
@@ -344,14 +514,14 @@
     theme = gnome_theme_info_find (name);
 
   gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "window_themes_delete"),
-			    theme_is_writable (theme));
+                theme_is_writable (theme));
 }
 
 static void
 icon_theme_changed (GConfPropertyEditor *peditor,
-		    const gchar *key,
-		    const GConfValue *value,
-		    AppearanceData *data)
+            const gchar *key,
+            const GConfValue *value,
+            AppearanceData *data)
 {
   GnomeThemeIconInfo *theme = NULL;
   const gchar *name;
@@ -360,7 +530,7 @@
     theme = gnome_theme_icon_info_find (name);
 
   gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "icon_themes_delete"),
-			    theme_is_writable (theme));
+                theme_is_writable (theme));
 }
 
 #ifdef HAVE_XCURSOR
@@ -435,7 +605,7 @@
       size = g_array_index (theme->sizes, gint, i);
 
       if (size == gconf_size) {
-      	index = i;
+          index = i;
         break;
       } else if (size > gconf_size) {
         if (i == 0) {
@@ -469,9 +639,9 @@
 
 static void
 cursor_theme_changed (GConfPropertyEditor *peditor,
-		    const gchar *key,
-		    const GConfValue *value,
-		    AppearanceData *data)
+            const gchar *key,
+            const GConfValue *value,
+            AppearanceData *data)
 {
   GnomeThemeCursorInfo *theme = NULL;
   const gchar *name;
@@ -482,7 +652,7 @@
   update_cursor_size_scale (theme, data);
 
   gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "cursor_themes_delete"),
-			    theme_is_writable (theme));
+                theme_is_writable (theme));
 
 }
 
@@ -514,8 +684,8 @@
           theme_model_iter_last (model, &iter)) {
         gtk_tree_path_free (path);
         path = gtk_tree_model_get_path (model, &iter);
-	gtk_tree_selection_select_path (selection, path);
-	gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
+    gtk_tree_selection_select_path (selection, path);
+    gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
       }
       gtk_tree_path_free (path);
     }
@@ -549,10 +719,10 @@
 
 static void
 add_to_treeview (const gchar *tv_name,
-		 const gchar *theme_name,
-		 const gchar *theme_label,
-		 GdkPixbuf *theme_thumbnail,
-		 AppearanceData *data)
+         const gchar *theme_name,
+         const gchar *theme_label,
+         GdkPixbuf *theme_thumbnail,
+         AppearanceData *data)
 {
   GtkTreeView *treeview;
   GtkListStore *model;
@@ -571,8 +741,8 @@
 
 static void
 remove_from_treeview (const gchar *tv_name,
-		      const gchar *theme_name,
-		      AppearanceData *data)
+              const gchar *theme_name,
+              AppearanceData *data)
 {
   GtkTreeView *treeview;
   GtkListStore *model;
@@ -589,9 +759,9 @@
 
 static void
 update_in_treeview (const gchar *tv_name,
-		    const gchar *theme_name,
-		    const gchar *theme_label,
-		    AppearanceData *data)
+            const gchar *theme_name,
+            const gchar *theme_label,
+            AppearanceData *data)
 {
   GtkTreeView *treeview;
   GtkListStore *model;
@@ -612,9 +782,9 @@
 
 static void
 update_thumbnail_in_treeview (const gchar *tv_name,
-		    const gchar *theme_name,
-		    GdkPixbuf *theme_thumbnail,
-		    AppearanceData *data)
+            const gchar *theme_name,
+            GdkPixbuf *theme_thumbnail,
+            AppearanceData *data)
 {
   GtkTreeView *treeview;
   GtkListStore *model;
@@ -663,8 +833,8 @@
 
 static void
 changed_on_disk_cb (GnomeThemeCommonInfo *theme,
-		    GnomeThemeChangeType  change_type,
-		    AppearanceData       *data)
+            GnomeThemeChangeType  change_type,
+            AppearanceData       *data)
 {
   if (theme->type == GNOME_THEME_TYPE_REGULAR) {
     GnomeThemeInfo *info = (GnomeThemeInfo *) theme;
@@ -857,7 +1027,8 @@
   data->gtk_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/gtk-theme-thumbnailing.png", NULL);
   data->window_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/window-theme-thumbnailing.png", NULL);
   data->icon_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/icon-theme-thumbnailing.png", NULL);
-
+  data->color_schemes_key_file = NULL;
+  
   w = glade_xml_get_widget (data->xml, "theme_details");
   g_signal_connect (w, "response", (GCallback) style_response_cb, NULL);
   g_signal_connect (w, "delete_event", (GCallback) gtk_true, NULL);
@@ -904,6 +1075,8 @@
   for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i)
     g_signal_connect (glade_xml_get_widget (data->xml, symbolic_names[i]), "color-set", (GCallback) color_button_clicked_cb, data);
 
+  /* color schemes */
+  g_signal_connect (glade_xml_get_widget (data->xml, "color_scheme_combo"), "changed", (GCallback) color_scheme_combo_changed_cb, data);
   /* revert button */
   g_signal_connect (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), "clicked", (GCallback) color_scheme_defaults_button_clicked_cb, data);
   /* delete buttons */
@@ -924,4 +1097,6 @@
     g_object_unref (data->window_theme_icon);
   if (data->icon_theme_icon)
     g_object_unref (data->icon_theme_icon);
+  if (data->color_schemes_key_file)
+    g_key_file_free (data->color_schemes_key_file);
 }
diff -Naur gnome-control-center (copia 5)/capplets/appearance/data/appearance.glade gnome-control-center/capplets/appearance/data/appearance.glade
--- gnome-control-center (copia 5)/capplets/appearance/data/appearance.glade	2007-11-24 19:28:33.000000000 +0100
+++ gnome-control-center/capplets/appearance/data/appearance.glade	2007-11-25 14:10:09.000000000 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.0 on Sun Nov 25 14:10:09 2007 -->
 <glade-interface>
   <widget class="GtkDialog" id="render_details">
     <property name="border_width">5</property>
@@ -41,33 +42,34 @@
                       <widget class="GtkHBox" id="hbox20">
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
-                      <child>
-                      <widget class="GtkSpinButton" id="dpi_spinner">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="adjustment">96 50 200 1 10 10</property>
-                        <property name="climb_rate">1</property>
-                      </widget>
-                      <packing>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label16">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">dots per inch</property>
+                        <child>
+                          <widget class="GtkSpinButton" id="dpi_spinner">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">96 50 200 1 10 10</property>
+                            <property name="climb_rate">1</property>
+                          </widget>
+                          <packing>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label16">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">dots per inch</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
@@ -96,142 +98,139 @@
                 <child>
                   <widget class="GtkAlignment" id="alignment20">
                     <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">1</property>
-                    <property name="yscale">1</property>
                     <property name="top_padding">6</property>
-                    <property name="bottom_padding">0</property>
                     <property name="left_padding">12</property>
-                    <property name="right_padding">0</property>
-                  <child>
-                  <widget class="GtkTable" id="table5">
-                    <property name="visible">True</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">12</property>
-                    <property name="row_spacing">6</property>
-                    <child>
-                      <placeholder/>
-                    </child>
                     <child>
-                      <widget class="GtkVBox" id="vbox12">
+                      <widget class="GtkTable" id="table5">
                         <property name="visible">True</property>
-                        <property name="spacing">3</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkRadioButton" id="antialias_none_radio">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_None</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
+                          <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment6">
+                          <widget class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
-                            <property name="border_width">0</property>
+                            <property name="spacing">3</property>
+                            <child>
+                              <widget class="GtkRadioButton" id="antialias_subpixel_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Sub_pixel (LCDs)</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">antialias_none_radio</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
                             <child>
-                              <widget class="GtkDrawingArea" id="antialias_none_sample">
+                              <widget class="GtkAlignment" id="alignment8">
                                 <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="antialias_subpixel_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
                               </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox13">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
                         <child>
-                          <widget class="GtkRadioButton" id="antialias_grayscale_radio">
+                          <widget class="GtkVBox" id="vbox13">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Gra_yscale</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">antialias_none_radio</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment7">
-                            <property name="visible">True</property>
-                            <property name="border_width">0</property>
+                            <property name="spacing">3</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="antialias_grayscale_sample">
+                              <widget class="GtkRadioButton" id="antialias_grayscale_radio">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Gra_yscale</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">antialias_none_radio</property>
                               </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment7">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="antialias_grayscale_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox14">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <widget class="GtkRadioButton" id="antialias_subpixel_radio">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Sub_pixel (LCDs)</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">antialias_none_radio</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment8">
+                          <widget class="GtkVBox" id="vbox12">
                             <property name="visible">True</property>
-                            <property name="border_width">0</property>
+                            <property name="spacing">3</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="antialias_subpixel_sample">
+                              <widget class="GtkRadioButton" id="antialias_none_radio">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_None</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
                               </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment6">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="antialias_none_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
                       </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
                     </child>
                   </widget>
-                 </child>
-                </widget>
-              </child>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="position">1</property>
@@ -255,178 +254,175 @@
                 <child>
                   <widget class="GtkAlignment" id="alignment21">
                     <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">1</property>
-                    <property name="yscale">1</property>
                     <property name="top_padding">6</property>
-                    <property name="bottom_padding">0</property>
                     <property name="left_padding">12</property>
-                    <property name="right_padding">0</property>
-                  <child>
-                  <widget class="GtkTable" id="table6">
-                    <property name="visible">True</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">12</property>
-                    <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox15">
+                      <widget class="GtkTable" id="table6">
                         <property name="visible">True</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <widget class="GtkRadioButton" id="hint_none_radio">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">N_one</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment9">
+                          <widget class="GtkVBox" id="vbox18">
                             <property name="visible">True</property>
-                            <property name="border_width">0</property>
+                            <property name="spacing">3</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="hint_none_sample">
+                              <widget class="GtkRadioButton" id="hint_full_radio">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Full</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">hint_none_radio</property>
                               </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
                             </child>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox16">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <widget class="GtkRadioButton" id="hint_slight_radio">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_Slight</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">hint_none_radio</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment10">
-                            <property name="visible">True</property>
-                            <property name="border_width">0</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="hint_slight_sample">
+                              <widget class="GtkAlignment" id="alignment12">
                                 <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="hint_full_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
                               </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox17">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
                         <child>
-                          <widget class="GtkRadioButton" id="hint_medium_radio">
+                          <widget class="GtkVBox" id="vbox17">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_Medium</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">hint_none_radio</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment11">
-                            <property name="visible">True</property>
-                            <property name="border_width">0</property>
+                            <property name="spacing">3</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="hint_medium_sample">
+                              <widget class="GtkRadioButton" id="hint_medium_radio">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Medium</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">hint_none_radio</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment11">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="hint_medium_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
                               </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox18">
-                        <property name="visible">True</property>
-                        <property name="spacing">3</property>
                         <child>
-                          <widget class="GtkRadioButton" id="hint_full_radio">
+                          <widget class="GtkVBox" id="vbox16">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_Full</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">hint_none_radio</property>
+                            <property name="spacing">3</property>
+                            <child>
+                              <widget class="GtkRadioButton" id="hint_slight_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Slight</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">hint_none_radio</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment10">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="hint_slight_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment12">
+                          <widget class="GtkVBox" id="vbox15">
                             <property name="visible">True</property>
-                            <property name="border_width">0</property>
+                            <property name="spacing">3</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="hint_full_sample">
+                              <widget class="GtkRadioButton" id="hint_none_radio">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">N_one</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment9">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkDrawingArea" id="hint_none_sample">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                </child>
                               </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
                     </child>
                   </widget>
-                 </child>
-                </widget>
-              </child>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="position">2</property>
@@ -450,149 +446,146 @@
                 <child>
                   <widget class="GtkAlignment" id="alignment22">
                     <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">1</property>
-                    <property name="yscale">1</property>
                     <property name="top_padding">6</property>
-                    <property name="bottom_padding">0</property>
                     <property name="left_padding">12</property>
-                    <property name="right_padding">0</property>
-                  <child>
-                  <widget class="GtkTable" id="table7">
-                    <property name="visible">True</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">12</property>
-                    <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <widget class="GtkTable" id="table7">
                         <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkRadioButton" id="subpixel_rgb_radio">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_RGB</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImage" id="subpixel_rgb_image">
+                          <widget class="GtkHBox" id="hbox5">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
+                            <child>
+                              <widget class="GtkRadioButton" id="subpixel_vbgr_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">VB_GR</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">subpixel_rgb_radio</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="subpixel_vbgr_image">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-missing-image</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">0</property>
-                            <property name="position">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox3">
-                        <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkRadioButton" id="subpixel_bgr_radio">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_BGR</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">subpixel_rgb_radio</property>
-                          </widget>
-                        </child>
                         <child>
-                          <widget class="GtkImage" id="subpixel_bgr_image">
+                          <widget class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
+                            <child>
+                              <widget class="GtkRadioButton" id="subpixel_vrgb_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_VRGB</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">subpixel_rgb_radio</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="subpixel_vrgb_image">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-missing-image</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">0</property>
-                            <property name="position">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox4">
-                        <property name="visible">True</property>
                         <child>
-                          <widget class="GtkRadioButton" id="subpixel_vrgb_radio">
+                          <widget class="GtkHBox" id="hbox3">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">_VRGB</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">subpixel_rgb_radio</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImage" id="subpixel_vrgb_image">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
+                            <child>
+                              <widget class="GtkRadioButton" id="subpixel_bgr_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_BGR</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">subpixel_rgb_radio</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="subpixel_bgr_image">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-missing-image</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">0</property>
-                            <property name="position">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox5">
-                        <property name="visible">True</property>
                         <child>
-                          <widget class="GtkRadioButton" id="subpixel_vbgr_radio">
+                          <widget class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">VB_GR</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">subpixel_rgb_radio</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImage" id="subpixel_vbgr_image">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-missing-image</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">0</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
+                            <child>
+                              <widget class="GtkRadioButton" id="subpixel_rgb_radio">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_RGB</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="subpixel_rgb_image">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-missing-image</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
                     </child>
                   </widget>
-                  </child>
-                 </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
@@ -679,8 +672,8 @@
                 <child>
                   <widget class="GtkVBox" id="theme_list_vbox">
                     <property name="visible">True</property>
-                    <property name="spacing">6</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="spacing">6</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">True</property>
@@ -691,16 +684,16 @@
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
                           <widget class="GtkIconView" id="theme_list">
+                            <property name="width_request">1</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+                            <property name="item_width">138</property>
+                            <property name="spacing">3</property>
                             <property name="row_spacing">18</property>
                             <property name="column_spacing">18</property>
-                            <property name="spacing">3</property>
                             <property name="margin">18</property>
-                            <property name="width_request">1</property>
-                            <property name="item_width">138</property>
                           </widget>
                         </child>
                       </widget>
@@ -714,37 +707,24 @@
                     <property name="spacing">6</property>
                     <property name="layout_style">GTK_BUTTONBOX_END</property>
                     <child>
-                      <widget class="GtkButton" id="theme_install">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Install...</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="GtkButton" id="theme_delete">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-delete</property>
                         <property name="use_stock">True</property>
-                        <property name="sensitive">False</property>
+                        <property name="response_id">0</property>
                       </widget>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <widget class="GtkButton" id="theme_save">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Save _As...</property>
-                        <property name="sensitive">False</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -757,11 +737,25 @@
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">C_ustomize...</property>
                         <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkButton" id="theme_install">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">_Install...</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -769,9 +763,6 @@
                   </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="tab_expand">False</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label1">
@@ -781,7 +772,6 @@
               </widget>
               <packing>
                 <property name="type">tab</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -844,16 +834,16 @@
                                 <property name="shadow_type">GTK_SHADOW_IN</property>
                                 <child>
                                   <widget class="GtkIconView" id="wp_view">
+                                    <property name="width_request">1</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="has_tooltip">True</property>
                                     <property name="pixbuf_column">0</property>
                                     <property name="selection_mode">GTK_SELECTION_BROWSE</property>
                                     <property name="row_spacing">3</property>
                                     <property name="column_spacing">3</property>
                                     <property name="reorderable">True</property>
-                                    <property name="width_request">1</property>
-                                    <property name="has_tooltip">True</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -897,6 +887,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="label" translatable="yes">_Add...</property>
                                 <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -911,6 +902,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="label">gtk-remove</property>
                                 <property name="use_stock">True</property>
+                                <property name="response_id">0</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
@@ -1001,6 +993,7 @@
                       <widget class="GtkColorButton" id="wp_pcpicker">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                         <accessibility>
                           <atkproperty name="AtkObject::accessible_description" translatable="yes">Open a dialog to specify the color</atkproperty>
                         </accessibility>
@@ -1014,6 +1007,7 @@
                     <child>
                       <widget class="GtkColorButton" id="wp_scpicker">
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                         <accessibility>
                           <atkproperty name="AtkObject::accessible_description" translatable="yes">Open a dialog to specify the color</atkproperty>
                         </accessibility>
@@ -1034,7 +1028,6 @@
               </widget>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1046,7 +1039,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1063,76 +1055,60 @@
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkFontButton" id="document_font">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="use_font">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label32">
+                      <widget class="GtkLabel" id="label28">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Document font:</property>
+                        <property name="label" translatable="yes">_Application font:</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">document_font</property>
+                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                        <property name="mnemonic_widget">application_font</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFontButton" id="desktop_font">
+                      <widget class="GtkFontButton" id="application_font">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                         <property name="use_font">True</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFontButton" id="window_title_font">
+                      <widget class="GtkLabel" id="label29">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="use_font">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Fixed width font:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                        <property name="mnemonic_widget">monospace_font</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFontButton" id="monospace_font">
+                      <widget class="GtkLabel" id="label30">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="use_font">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Window title font:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                        <property name="mnemonic_widget">window_title_font</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -1154,59 +1130,80 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label30">
+                      <widget class="GtkFontButton" id="monospace_font">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Window title font:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                        <property name="mnemonic_widget">window_title_font</property>
+                        <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
+                        <property name="use_font">True</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label29">
+                      <widget class="GtkFontButton" id="window_title_font">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Fixed width font:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                        <property name="mnemonic_widget">monospace_font</property>
+                        <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
+                        <property name="use_font">True</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFontButton" id="application_font">
+                      <widget class="GtkFontButton" id="desktop_font">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                         <property name="use_font">True</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label28">
+                      <widget class="GtkLabel" id="label32">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Application font:</property>
+                        <property name="label" translatable="yes">_Document font:</property>
                         <property name="use_underline">True</property>
-                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                        <property name="mnemonic_widget">application_font</property>
+                        <property name="mnemonic_widget">document_font</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFontButton" id="document_font">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
+                        <property name="use_font">True</property>
                       </widget>
                       <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -1244,17 +1241,17 @@
                             <property name="column_spacing">12</property>
                             <property name="row_spacing">6</property>
                             <child>
-                              <widget class="GtkVBox" id="vbox21">
+                              <widget class="GtkVBox" id="vbox11">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="subpixel_radio">
+                                  <widget class="GtkRadioButton" id="monochrome_radio">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Sub_pixel smoothing (LCDs)</property>
+                                    <property name="label" translatable="yes">_Monochrome</property>
                                     <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                    <property name="group">monochrome_radio</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1262,10 +1259,10 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment13">
+                                  <widget class="GtkAlignment" id="alignment2">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkDrawingArea" id="subpixel_sample">
+                                      <widget class="GtkDrawingArea" id="monochrome_sample">
                                         <property name="visible">True</property>
                                       </widget>
                                     </child>
@@ -1275,23 +1272,18 @@
                                   </packing>
                                 </child>
                               </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox20">
+                              <widget class="GtkVBox" id="vbox19">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="best_contrast_radio">
+                                  <widget class="GtkRadioButton" id="best_shapes_radio">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Best co_ntrast</property>
+                                    <property name="label" translatable="yes">Best _shapes</property>
                                     <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">monochrome_radio</property>
                                   </widget>
@@ -1301,10 +1293,10 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment4">
+                                  <widget class="GtkAlignment" id="alignment3">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkDrawingArea" id="best_contrast_sample">
+                                      <widget class="GtkDrawingArea" id="best_shapes_sample">
                                         <property name="visible">True</property>
                                       </widget>
                                     </child>
@@ -1315,20 +1307,21 @@
                                 </child>
                               </widget>
                               <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox19">
+                              <widget class="GtkVBox" id="vbox20">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="best_shapes_radio">
+                                  <widget class="GtkRadioButton" id="best_contrast_radio">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Best _shapes</property>
+                                    <property name="label" translatable="yes">Best co_ntrast</property>
                                     <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">monochrome_radio</property>
                                   </widget>
@@ -1338,10 +1331,10 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment3">
+                                  <widget class="GtkAlignment" id="alignment4">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkDrawingArea" id="best_shapes_sample">
+                                      <widget class="GtkDrawingArea" id="best_contrast_sample">
                                         <property name="visible">True</property>
                                       </widget>
                                     </child>
@@ -1352,21 +1345,23 @@
                                 </child>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox11">
+                              <widget class="GtkVBox" id="vbox21">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="monochrome_radio">
+                                  <widget class="GtkRadioButton" id="subpixel_radio">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">_Monochrome</property>
+                                    <property name="label" translatable="yes">Sub_pixel smoothing (LCDs)</property>
                                     <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
+                                    <property name="group">monochrome_radio</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1374,10 +1369,10 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment2">
+                                  <widget class="GtkAlignment" id="alignment13">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkDrawingArea" id="monochrome_sample">
+                                      <widget class="GtkDrawingArea" id="subpixel_sample">
                                         <property name="visible">True</property>
                                       </widget>
                                     </child>
@@ -1387,6 +1382,12 @@
                                   </packing>
                                 </child>
                               </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
                             </child>
                           </widget>
                         </child>
@@ -1412,6 +1413,7 @@
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">D_etails...</property>
                         <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                     </child>
                   </widget>
@@ -1422,7 +1424,6 @@
               </widget>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1434,7 +1435,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1482,6 +1482,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="label" translatable="yes">Show _icons in menus</property>
                                 <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
@@ -1496,6 +1497,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="label" translatable="yes">_Editable menu shortcut keys</property>
                                 <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
@@ -1816,7 +1818,6 @@
               </widget>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1828,7 +1829,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1928,12 +1928,13 @@
                     <child>
                       <widget class="GtkButton" id="gtk_themes_delete">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-delete</property>
                         <property name="use_stock">True</property>
-                        <property name="sensitive">False</property>
+                        <property name="response_id">0</property>
                       </widget>
                     </child>
                   </widget>
@@ -1943,9 +1944,6 @@
                   </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="tab_expand">False</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label41">
@@ -1955,7 +1953,6 @@
               </widget>
               <packing>
                 <property name="type">tab</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -2007,74 +2004,84 @@
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">12</property>
                     <child>
-                      <widget class="GtkColorButton" id="tooltip_fg_color">
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Background</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label7">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Text</property>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="right_attach">3</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="tooltip_bg_color">
+                      <widget class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Windows:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">bg_color</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label12">
+                      <widget class="GtkLabel" id="label2">
                         <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Tooltips:</property>
+                        <property name="label" translatable="yes">_Input boxes:</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">tooltip_bg_color</property>
+                        <property name="mnemonic_widget">base_color</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <widget class="GtkColorButton" id="selected_fg_color">
+                      <widget class="GtkColorButton" id="bg_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options"></property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="text_color">
+                      <widget class="GtkColorButton" id="base_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
                         <property name="x_options"></property>
@@ -2082,15 +2089,16 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="fg_color">
+                      <widget class="GtkColorButton" id="selected_bg_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options"></property>
                         <property name="y_options"></property>
                       </packing>
@@ -2109,27 +2117,29 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="selected_bg_color">
+                      <widget class="GtkColorButton" id="fg_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options"></property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="base_color">
+                      <widget class="GtkColorButton" id="text_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
                         <property name="x_options"></property>
@@ -2137,75 +2147,103 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="bg_color">
+                      <widget class="GtkColorButton" id="selected_fg_color">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options"></property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label2">
+                      <widget class="GtkLabel" id="label12">
                         <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Input boxes:</property>
+                        <property name="label" translatable="yes">_Tooltips:</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">base_color</property>
+                        <property name="mnemonic_widget">tooltip_bg_color</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label3">
+                      <widget class="GtkColorButton" id="tooltip_bg_color">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Windows:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">bg_color</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label7">
+                      <widget class="GtkColorButton" id="tooltip_fg_color">
                         <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Text</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="response_id">0</property>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="right_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkTable" id="table1">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="n_rows">1</property>
+                    <property name="n_columns">2</property>
                     <child>
-                      <widget class="GtkLabel" id="label6">
+                      <widget class="GtkComboBox" id="color_scheme_combo">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Background</property>
+                        <property name="items" translatable="yes"></property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="label13">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Color Schemes:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">color_scheme_combo</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -2220,18 +2258,18 @@
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">_Reset to Defaults</property>
+                        <property name="response_id">0</property>
                       </widget>
                     </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </widget>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2243,7 +2281,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -2281,12 +2318,13 @@
                     <child>
                       <widget class="GtkButton" id="window_themes_delete">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-delete</property>
                         <property name="use_stock">True</property>
-                        <property name="sensitive">False</property>
+                        <property name="response_id">0</property>
                       </widget>
                     </child>
                   </widget>
@@ -2298,7 +2336,6 @@
               </widget>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2310,7 +2347,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -2348,12 +2384,13 @@
                     <child>
                       <widget class="GtkButton" id="icon_themes_delete">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-delete</property>
                         <property name="use_stock">True</property>
-                        <property name="sensitive">False</property>
+                        <property name="response_id">0</property>
                       </widget>
                     </child>
                   </widget>
@@ -2365,7 +2402,6 @@
               </widget>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2377,7 +2413,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -2390,8 +2425,8 @@
                 <child>
                   <widget class="GtkHBox" id="cursor_message_hbox">
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="spacing">6</property>
                     <property name="no_show_all">True</property>
+                    <property name="spacing">6</property>
                     <child>
                       <widget class="GtkImage" id="image3">
                         <property name="visible">True</property>
@@ -2445,10 +2480,10 @@
                 </child>
                 <child>
                   <widget class="GtkHBox" id="cursor_size_hbox">
-                     <property name="visible">True</property>
-                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="spacing">12</property>
-                     <child>
+                    <child>
                       <widget class="GtkLabel" id="cursor_size_label">
                         <property name="label" translatable="yes">_Size:</property>
                         <property name="use_underline">True</property>
@@ -2460,8 +2495,8 @@
                     </child>
                     <child>
                       <widget class="GtkHBox" id="hbox13">
-                         <property name="visible">True</property>
-                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">6</property>
                         <child>
                           <widget class="GtkLabel" id="cursor_size_small_label">
@@ -2480,8 +2515,8 @@
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="adjustment">0 0 100 1 0 0</property>
-                            <property name="draw_value">False</property>
                             <property name="digits">0</property>
+                            <property name="draw_value">False</property>
                           </widget>
                           <packing>
                             <property name="position">1</property>
@@ -2503,7 +2538,7 @@
                       <packing>
                         <property name="position">1</property>
                       </packing>
-                     </child>
+                    </child>
                     <child>
                       <widget class="GtkHButtonBox" id="hbuttonbox9">
                         <property name="visible">True</property>
@@ -2528,15 +2563,14 @@
                       </packing>
                     </child>
                   </widget>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="position">2</property>
-                   </packing>
-                 </child>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="position">4</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2548,7 +2582,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">4</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -2598,218 +2631,144 @@
   <widget class="GtkDialog" id="theme_save_dialog">
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Save Theme As...</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
     <property name="modal">True</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
     <property name="has_separator">False</property>
-
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
         <property name="spacing">2</property>
-
-        <child internal-child="action_area">
-	  <widget class="GtkHButtonBox" id="dialog-action_area3">
-	    <property name="visible">True</property>
-	    <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	    <child>
-	      <widget class="GtkButton" id="save_dialog_cancel_button">
-	        <property name="visible">True</property>
-	        <property name="can_default">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="label">gtk-cancel</property>
-	        <property name="use_stock">True</property>
-	        <property name="relief">GTK_RELIEF_NORMAL</property>
-	        <property name="focus_on_click">True</property>
-	        <property name="response_id">-6</property>
-	      </widget>
-	    </child>
-
-	    <child>
-	      <widget class="GtkButton" id="save_dialog_save_button">
-	        <property name="visible">True</property>
-	        <property name="can_default">True</property>
-	        <property name="has_default">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="label">gtk-save</property>
-	        <property name="use_stock">True</property>
-	        <property name="relief">GTK_RELIEF_NORMAL</property>
-	        <property name="focus_on_click">True</property>
-	        <property name="response_id">-5</property>
-	      </widget>
-	    </child>
-	  </widget>
-	  <packing>
-	    <property name="padding">0</property>
-	    <property name="expand">False</property>
-	    <property name="fill">True</property>
-	    <property name="pack_type">GTK_PACK_END</property>
-	  </packing>
-        </child>
-
         <child>
-	  <widget class="GtkTable" id="table3">
-	    <property name="border_width">6</property>
-	    <property name="visible">True</property>
-	    <property name="n_rows">3</property>
-	    <property name="n_columns">2</property>
-	    <property name="homogeneous">False</property>
-	    <property name="row_spacing">6</property>
-	    <property name="column_spacing">12</property>
-
-	    <child>
-	      <widget class="GtkEntry" id="save_dialog_entry">
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="editable">True</property>
-	        <property name="visibility">True</property>
-	        <property name="max_length">0</property>
-	        <property name="text" translatable="yes"></property>
-	        <property name="has_frame">True</property>
-	        <property name="activates_default">True</property>
-	      </widget>
-	      <packing>
-	        <property name="left_attach">1</property>
-	        <property name="right_attach">2</property>
-	        <property name="top_attach">0</property>
-	        <property name="bottom_attach">1</property>
-	        <property name="y_options"></property>
-	      </packing>
-	    </child>
-
-	    <child>
-	      <widget class="GtkLabel" id="label49">
-	        <property name="visible">True</property>
-	        <property name="label" translatable="yes">_Name:</property>
-	        <property name="use_underline">True</property>
-	        <property name="use_markup">False</property>
-	        <property name="justify">GTK_JUSTIFY_LEFT</property>
-	        <property name="wrap">False</property>
-	        <property name="selectable">False</property>
-	        <property name="xalign">0</property>
-	        <property name="yalign">0.5</property>
-	        <property name="xpad">0</property>
-	        <property name="ypad">0</property>
-	        <property name="mnemonic_widget">save_dialog_entry</property>
-	        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	        <property name="width_chars">-1</property>
-	        <property name="single_line_mode">False</property>
-	        <property name="angle">0</property>
-	      </widget>
-	      <packing>
-	        <property name="left_attach">0</property>
-	        <property name="right_attach">1</property>
-	        <property name="top_attach">0</property>
-	        <property name="bottom_attach">1</property>
-	        <property name="x_options">fill</property>
-	        <property name="y_options">fill</property>
-	      </packing>
-	    </child>
-
-	    <child>
-	      <widget class="GtkScrolledWindow" id="scrolledwindow4">
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-	        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	        <property name="shadow_type">GTK_SHADOW_IN</property>
-	        <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	        <child>
-		  <widget class="GtkTextView" id="save_dialog_textview">
-		    <property name="visible">True</property>
-		    <property name="can_focus">True</property>
-		    <property name="editable">True</property>
-		    <property name="overwrite">False</property>
-		    <property name="accepts_tab">False</property>
-		    <property name="justification">GTK_JUSTIFY_LEFT</property>
-		    <property name="wrap_mode">GTK_WRAP_WORD</property>
-		    <property name="cursor_visible">True</property>
-		    <property name="pixels_above_lines">0</property>
-		    <property name="pixels_below_lines">0</property>
-		    <property name="pixels_inside_wrap">0</property>
-		    <property name="left_margin">0</property>
-		    <property name="right_margin">0</property>
-		    <property name="indent">0</property>
-		    <property name="text" translatable="yes"></property>
-		  </widget>
-	        </child>
-	      </widget>
-	      <packing>
-	        <property name="left_attach">1</property>
-	        <property name="right_attach">2</property>
-	        <property name="top_attach">1</property>
-	        <property name="bottom_attach">2</property>
-	      </packing>
-	    </child>
-
-	    <child>
-	      <widget class="GtkLabel" id="label50">
-	        <property name="visible">True</property>
-	        <property name="label" translatable="yes">_Description:</property>
-	        <property name="use_underline">True</property>
-	        <property name="use_markup">False</property>
-	        <property name="justify">GTK_JUSTIFY_LEFT</property>
-	        <property name="wrap">False</property>
-	        <property name="selectable">False</property>
-	        <property name="xalign">0</property>
-	        <property name="yalign">0</property>
-	        <property name="xpad">0</property>
-	        <property name="ypad">0</property>
-	        <property name="mnemonic_widget">save_dialog_textview</property>
-	        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	        <property name="width_chars">-1</property>
-	        <property name="single_line_mode">False</property>
-	        <property name="angle">0</property>
-	      </widget>
-	      <packing>
-	        <property name="left_attach">0</property>
-	        <property name="right_attach">1</property>
-	        <property name="top_attach">1</property>
-	        <property name="bottom_attach">2</property>
-	        <property name="x_options">fill</property>
-	        <property name="y_options">fill</property>
-	      </packing>
-	    </child>
-
-	    <child>
-	      <widget class="GtkCheckButton" id="save_background_checkbutton">
-	        <property name="visible">True</property>
-	        <property name="can_focus">True</property>
-	        <property name="label" translatable="yes">Save _background image</property>
-	        <property name="use_underline">True</property>
-	        <property name="relief">GTK_RELIEF_NORMAL</property>
-	        <property name="focus_on_click">True</property>
-	        <property name="active">False</property>
-	        <property name="inconsistent">False</property>
-	        <property name="draw_indicator">True</property>
-	      </widget>
-	      <packing>
-	        <property name="left_attach">1</property>
-	        <property name="right_attach">2</property>
-	        <property name="top_attach">2</property>
-	        <property name="bottom_attach">3</property>
-	        <property name="x_options">fill</property>
-	        <property name="y_options"></property>
-	      </packing>
-	    </child>
-	  </widget>
-	  <packing>
-	    <property name="padding">0</property>
-	    <property name="expand">True</property>
-	    <property name="fill">True</property>
-	  </packing>
+          <widget class="GtkTable" id="table3">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">12</property>
+            <property name="row_spacing">6</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="save_background_checkbutton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Save _background image</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label50">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">_Description:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">save_dialog_textview</property>
+              </widget>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledwindow4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <child>
+                  <widget class="GtkTextView" id="save_dialog_textview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="wrap_mode">GTK_WRAP_WORD</property>
+                    <property name="accepts_tab">False</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label49">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Name:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">save_dialog_entry</property>
+              </widget>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="save_dialog_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="activates_default">True</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="save_dialog_cancel_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="save_dialog_save_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="label">gtk-save</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
         </child>
       </widget>
     </child>
