Index: appearance-desktop-effects.c
===================================================================
--- appearance-desktop-effects.c	(revision 0)
+++ appearance-desktop-effects.c	(revision 0)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2007 The GNOME Foundation
+ * Written by Thomas Wood <thos@gnome.org>
+ *            Jens Granseuer <jensgr@gmx.net>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "appearance.h"
+#include <glib/gi18n.h>
+
+static void
+enable_desktop_effects_cb (GtkToggleButton *toggle_button, AppearanceData *data)
+{
+  gchar *cmd_line = NULL;
+  GError *error = NULL;
+
+  if (gtk_toggle_button_get_active (toggle_button))
+    cmd_line = g_strdup ("compiz --replace ccp");
+  else
+    cmd_line = g_strdup ("metacity --replace");
+
+  if (!g_spawn_command_line_async (cmd_line, &error)) {
+    /* FIXME: display error */
+    g_error_free (error);
+  }
+
+  g_free (cmd_line);
+}
+
+static void
+customize_desktop_effects_cb (GtkButton *button, AppearanceData *data)
+{
+  GError *error = NULL;
+
+  if (!g_spawn_command_line_async ("ccsm", &error)) {
+    /* FIXME: display error */
+    g_error_free (error);
+  }
+}
+
+void
+desktop_effects_init (AppearanceData *data)
+{
+  GtkWidget *enable_effects_button;
+  GtkWidget *customize_effects_button;
+
+  /* initialize widgets */
+  enable_effects_button = glade_xml_get_widget (data->xml, "enable_desktop_effects");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_effects_button),
+				gtk_widget_is_composited (enable_effects_button));
+  g_signal_connect (G_OBJECT (enable_effects_button), "toggled", (GCallback) enable_desktop_effects_cb, data);
+
+  customize_effects_button = glade_xml_get_widget (data->xml, "customize_desktop_effects");
+  gtk_widget_set_sensitive (customize_effects_button,
+			    gtk_toggle_button_get_active (enable_effects_button));
+  g_signal_connect (G_OBJECT (customize_effects_button), "clicked", (GCallback) customize_desktop_effects_cb, data);
+}
+
+void
+desktop_effects_shutdown (AppearanceData *data)
+{
+}
Index: appearance-desktop-effects.h
===================================================================
--- appearance-desktop-effects.h	(revision 0)
+++ appearance-desktop-effects.h	(revision 0)
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2007 The GNOME Foundation
+ * Written by Thomas Wood <thos@gnome.org>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+void desktop_effects_init (AppearanceData *data);
+void desktop_effects_shutdown (AppearanceData *data);
Index: data/appearance.glade
===================================================================
--- data/appearance.glade	(revision 8593)
+++ data/appearance.glade	(working copy)
@@ -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.1.5 on Thu Mar 27 15:13:01 2008 by rodrigo@panticosa-->
 <glade-interface>
   <widget class="GtkDialog" id="render_details">
     <property name="border_width">5</property>
@@ -41,35 +42,36 @@
                       <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>
+                        <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">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>
-                      </packing>
-                    </child>
                   </widget>
                 </child>
               </widget>
@@ -96,142 +98,136 @@
                 <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="GtkDrawingArea" id="antialias_none_sample">
+                              <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>
+                              </packing>
                             </child>
+                            <child>
+                              <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="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>
+                            <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="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">
+                          <widget class="GtkVBox" id="vbox12">
                             <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>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment8">
-                            <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="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 +251,171 @@
                 <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>
+                        <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="hint_none_radio">
+                          <widget class="GtkVBox" id="vbox18">
                             <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>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment9">
-                            <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="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="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>
-                    </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">
+                          <widget class="GtkVBox" id="vbox17">
                             <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>
+                            <property name="spacing">3</property>
                             <child>
-                              <widget class="GtkDrawingArea" id="hint_slight_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="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="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="vbox16">
                             <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_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>
+                                <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="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="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="vbox15">
                             <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>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment12">
-                            <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="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 +439,142 @@
                 <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">
+                          <widget class="GtkHBox" id="hbox5">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes" comments="pixel order red, green, blue">_RGB</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</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" comments="vertical hinting, pixel order blue, green, red">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="position">1</property>
+                              </packing>
+                            </child>
                           </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="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">
+                          <widget class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes" comments="pixel order blue, green, red">_BGR</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">subpixel_rgb_radio</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" comments="vertical hinting, pixel order red, green, blue">_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>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </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="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" comments="vertical hinting, pixel order red, green, blue">_VRGB</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">subpixel_rgb_radio</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" comments="pixel order blue, green, red">_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">
+                                <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>
-                        <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="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" comments="vertical hinting, pixel order blue, green, red">VB_GR</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">subpixel_rgb_radio</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" comments="pixel order red, green, blue">_RGB</property>
+                                <property name="use_underline">True</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>
-                        <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>
-                  </child>
-                 </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
@@ -666,8 +648,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>
@@ -678,16 +660,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>
@@ -701,37 +683,22 @@
                     <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>
                       </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>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -749,6 +716,18 @@
                         <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>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -756,9 +735,6 @@
                   </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="tab_expand">False</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label1">
@@ -768,7 +744,6 @@
               </widget>
               <packing>
                 <property name="type">tab</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -831,15 +806,15 @@
                                 <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="width_request">1</property>
-                                    <property name="has_tooltip">True</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -1020,7 +995,6 @@
               </widget>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1032,7 +1006,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>
@@ -1049,37 +1022,21 @@
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <widget class="GtkFontButton" id="document_font">
+                      <widget class="GtkLabel" id="label28">
                         <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">
-                        <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="use_font">True</property>
@@ -1087,38 +1044,37 @@
                       <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>
@@ -1140,39 +1096,37 @@
                       </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="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="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="use_font">True</property>
@@ -1180,23 +1134,42 @@
                       <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="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>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -1230,17 +1203,16 @@
                             <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="draw_indicator">True</property>
-                                    <property name="group">monochrome_radio</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1248,36 +1220,30 @@
                                   </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>
                                   </widget>
                                   <packing>
-                                    <property name="position">1</property>
                                     <property name="expand">False</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>
-                              </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="draw_indicator">True</property>
                                     <property name="group">monochrome_radio</property>
@@ -1288,34 +1254,34 @@
                                   </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>
                                   </widget>
                                   <packing>
-                                    <property name="position">1</property>
                                     <property name="expand">False</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </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="draw_indicator">True</property>
                                     <property name="group">monochrome_radio</property>
@@ -1326,36 +1292,37 @@
                                   </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>
                                   </widget>
                                   <packing>
-                                    <property name="position">1</property>
                                     <property name="expand">False</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>
                               </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="draw_indicator">True</property>
+                                    <property name="group">monochrome_radio</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1363,33 +1330,39 @@
                                   </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>
                                   </widget>
                                   <packing>
-                                    <property name="position">1</property>
                                     <property name="expand">False</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>
+                              </packing>
                             </child>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="position">1</property>
                         <property name="expand">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">1</property>
                     <property name="expand">False</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -1408,14 +1381,13 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="position">2</property>
                     <property name="expand">False</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </widget>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1427,7 +1399,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>
@@ -1594,90 +1565,6 @@
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">_File</property>
                                     <property name="use_underline">True</property>
-                                    <child>
-                                      <widget class="GtkMenu" id="File Menu_menu">
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="menu_item_1">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_New</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image9">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-new</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="menu_item_2">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_Open</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image10">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-open</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="menu_item_3">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_Save</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image11">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-save</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkMenuItem" id="separator1">
-                                            <property name="visible">True</property>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="menu_item_4">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_Print</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image12">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-print</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkMenuItem" id="separator2">
-                                            <property name="visible">True</property>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="menu_item_5">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_Quit</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image13">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-quit</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                    </child>
                                   </widget>
                                 </child>
                                 <child>
@@ -1685,52 +1572,6 @@
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Edit</property>
                                     <property name="use_underline">True</property>
-                                    <child>
-                                      <widget class="GtkMenu" id="edit1_menu">
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="cut">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">C_ut</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image14">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-cut</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="copy">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_Copy</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image15">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-copy</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkImageMenuItem" id="paste">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">_Paste</property>
-                                            <property name="use_underline">True</property>
-                                            <child internal-child="image">
-                                              <widget class="GtkImage" id="menu-item-image16">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-paste</property>
-                                                <property name="icon_size">1</property>
-                                              </widget>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                    </child>
                                   </widget>
                                 </child>
                               </widget>
@@ -1749,7 +1590,6 @@
                                     <child>
                                       <widget class="GtkToolbar" id="toolbar_toolbar">
                                         <property name="visible">True</property>
-                                        <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
                                         <child>
                                           <widget class="GtkToolButton" id="button2">
                                             <property name="visible">True</property>
@@ -1809,7 +1649,6 @@
               </widget>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1821,10 +1660,84 @@
               <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>
+            <child>
+              <widget class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment14">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox3">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="enable_desktop_effects">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Enable desktop effects</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="customize_desktop_effects">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="tooltip_text">Configure specific desktop effects</property>
+                                <property name="label" translatable="yes">Customize</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Window Manager&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="padding">6</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label13">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Desktop effects</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>
@@ -1921,12 +1834,12 @@
                     <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>
                       </widget>
                     </child>
                   </widget>
@@ -1936,9 +1849,6 @@
                   </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="tab_expand">False</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label41">
@@ -1948,7 +1858,6 @@
               </widget>
               <packing>
                 <property name="type">tab</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -2000,74 +1909,82 @@
                     <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="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">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="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>
                       </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>
                       </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>
@@ -2075,15 +1992,15 @@
                       </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>
                       </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>
@@ -2102,27 +2019,27 @@
                       </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>
                       </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>
                       </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>
@@ -2130,71 +2047,63 @@
                       </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>
                       </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>
                       </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>
                       </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>
-                    <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>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -2224,7 +2133,6 @@
               </widget>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2236,7 +2144,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>
@@ -2274,12 +2181,12 @@
                     <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>
                       </widget>
                     </child>
                   </widget>
@@ -2291,7 +2198,6 @@
               </widget>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2303,7 +2209,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>
@@ -2341,12 +2246,12 @@
                     <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>
                       </widget>
                     </child>
                   </widget>
@@ -2358,7 +2263,6 @@
               </widget>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -2370,7 +2274,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>
@@ -2383,8 +2286,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>
@@ -2438,10 +2341,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>
@@ -2453,8 +2356,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">
@@ -2473,8 +2376,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>
@@ -2496,7 +2399,7 @@
                       <packing>
                         <property name="position">1</property>
                       </packing>
-                     </child>
+                    </child>
                     <child>
                       <widget class="GtkHButtonBox" id="hbuttonbox9">
                         <property name="visible">True</property>
@@ -2512,7 +2415,6 @@
                             <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="response_id">0</property>
                           </widget>
                         </child>
                       </widget>
@@ -2521,15 +2423,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>
@@ -2541,7 +2442,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>
@@ -2591,219 +2491,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="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>
   </widget>
Index: appearance-main.c
===================================================================
--- appearance-main.c	(revision 8593)
+++ appearance-main.c	(working copy)
@@ -20,9 +20,10 @@
 
 #include "appearance.h"
 #include "appearance-desktop.h"
+#include "appearance-desktop-effects.h"
 #include "appearance-font.h"
+#include "appearance-style.h"
 #include "appearance-themes.h"
-#include "appearance-style.h"
 #include "appearance-ui.h"
 #include "theme-installer.h"
 #include "theme-thumbnail.h"
@@ -79,6 +80,7 @@
 
     themes_shutdown (data);
     style_shutdown (data);
+    desktop_effects_shutdown (data);
     desktop_shutdown (data);
     font_shutdown (data);
 
@@ -151,6 +153,7 @@
   themes_init (data);
   style_init (data);
   desktop_init (data, (const gchar **) wallpaper_files);
+  desktop_effects_init (data);
   g_strfreev (wallpaper_files);
   font_init (data);
   ui_init (data);
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 8593)
+++ Makefile.am	(working copy)
@@ -9,6 +9,8 @@
 	appearance.h \
 	appearance-desktop.c \
 	appearance-desktop.h \
+	appearance-desktop-effects.c \
+	appearance-desktop-effects.h \
 	appearance-font.c \
 	appearance-font.h \
 	appearance-main.c \
