[Xfce4-commits] <xfwm4:master> Merge libxfce4ui branch

Olivier Fourdan noreply at xfce.org
Fri Mar 5 10:56:09 CET 2010


Updating branch refs/heads/master
         to fe18886f8a81a1d8f0814da56b932398ada68cfb (commit)
       from 5b50425d18a74fc0a91c91f9a8a8ca5b097e1b07 (commit)

commit fe18886f8a81a1d8f0814da56b932398ada68cfb
Merge: 5b50425d18a74fc0a91c91f9a8a8ca5b097e1b07 4f7a589a284799cae1c79c4eccb002195c73ef7b
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Mar 5 10:52:38 2010 +0100

    Merge libxfce4ui branch

commit 4f7a589a284799cae1c79c4eccb002195c73ef7b
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 12:46:43 2010 +0100

    Scroll to the current theme when launching the dialog.

commit 5a3fea279bcc75c5f09887cc2bd4f2f2f4101c48
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 12:35:27 2010 +0100

    Make the help buttons insensitive as we have no help atm.

commit 9827e2c0d968802a7a5ef34fc12f66764e29cebe
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 12:24:51 2010 +0100

    Add some missing orientations.

commit e3e23be8366d4dabd64a53e46f0d673acb0c479f
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 12:21:20 2010 +0100

    Don't save the settings dialogs when saving the session.

commit 2ffcbf4223c653f62fef73208c2683485de24e53
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 11:52:52 2010 +0100

    Fix the two other glade files.

commit 97a4ac3e8545e572586a8c40905c4f02cc83112e
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 28 11:44:35 2010 +0100

    Fix the glade file.
    
    Restore orientation properties and fix a crash in the dialog.

commit 66e9b937182e0dad01ff4b1aaf07aa524cea3973
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 18:41:36 2010 +0100

    Port the workspaces dialog.

commit 56da8ac04da7c5a0a4cf5eab69b3c9a5ed2cb4bd
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 18:40:31 2010 +0100

    Port the tweaks dialog to GtkBuilder.

commit ee1c3daf82af14e6cc54f72738dd25ee97314f72
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 18:37:23 2010 +0100

    Replace libxfcegui4 flags by libxfce4ui flags.

commit e2961a0313eabe7b17267369d97bf63b04b0b421
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 10:13:21 2010 +0100

    Port xfwm4-settings to GtkBuilder.

commit c62ca0d3ca9a8b13004eae5244ce39f64d81ecef
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 10:10:28 2010 +0100

    Port the build system to use GtkBuilder.

commit 849fe88cbb6b27bd4ef253bbcb165c961582a5a6
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Feb 27 10:09:22 2010 +0100

    Port the glade files to GtkBuilder format.

commit c400026f2ebe95afaad5c8254cdefc576421dfc0
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Feb 24 20:26:52 2010 +0100

    Allow only regular windows to be placed either above or below.

commit 366f4529971a360e6b4da0fc171c40b3e5399672
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Feb 24 14:24:27 2010 +0100

    Use explicit message when actual type of option does not match the expected type (so the warning can be useful)

commit 1b84cb5d4d2770003f66629428fdb4000b060227
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Feb 24 14:04:55 2010 +0100

    Treat utility and dialog windows with an invalid window for transient as transients for group

commit 643b0f8a0e55afd2c88bccce74d234c3dabbad6e
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Feb 24 09:44:17 2010 +0100

    Missing setting for cycle_apps_only
    cycle_apps_only defaults to false as it might be confusing at times

commit b8a8290970f674ae39f0269199dc5c6414114679
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Feb 23 21:38:34 2010 +0100

    Check for invalid type for GValue to avoid a crash (bug #6195)

commit 09e3177303833eb658ac3de6b7d57e1f88057bcd
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Feb 23 18:46:32 2010 +0100

    Avoid some updates to NET_WM_STATE

commit bb2e9dd619e86d77c079cf0a3a007d142db2128b
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Feb 23 09:11:47 2010 +0100

    Add linkage to libm when compositor is used (bug #6231)

commit 97c6c8a08da90be0dc16dfe1427a343169205c57
Author: Bauzhan Muftakhidinov <baurthefirst at gmail.com>
Date:   Fri Feb 19 19:16:27 2010 +0100

    l10n: Updated Kazakh (kk) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 208f30522a189a4d835125e385ee2f80951fdb55
Author: Robert Hartl <hartl.robert at gmail.com>
Date:   Thu Feb 18 01:29:49 2010 +0100

    l10n: Updated Slovak (sk) translation to 94%
    
    New status: 214 messages complete with 10 fuzzies and 2 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 62304e38123b0a0d73bfc66de85256533bee34b4
Author: Robert Hartl <hartl.robert at gmail.com>
Date:   Thu Feb 18 01:11:20 2010 +0100

    l10n: Updated Slovak (sk) translation to 94%
    
    New status: 214 messages complete with 10 fuzzies and 2 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 015636c3f4a0e25fbdd1fc1448cbda7727de6dcc
Author: Paul Seyfert <pseyfert at mathphys.fsk.uni-heidelberg.de>
Date:   Tue Feb 16 23:51:01 2010 +0100

    l10n: Updated German (de) translation to 98%
    
    New status: 223 messages complete with 3 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 9a0b718f524c4e164c4722b73699dfe2c3df7548
Author: Cristian Marchi <cri.penta at gmail.com>
Date:   Thu Feb 11 19:15:23 2010 +0100

    l10n: Updated Italian (it) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit b7cb6e211f468140a8bfd8ed8e35198637f66853
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Feb 9 16:48:31 2010 +0100

    Fix comment

commit fa3cc3738d8537d7b94dd497467a45eab8eda3de
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Feb 9 16:36:46 2010 +0100

    Recent Xorg drivers disable the output when the lid is closed, leaving no active monitor, in that case simply ignore the event to avoid messing with windows' positions (Bug #6209)

commit 3cac7a4504f641baf129b6b38794983dd2159e9c
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Fri Feb 5 17:21:06 2010 +0100

    l10n: Updated Hungarian (hu) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d7cd30b651eb2f386787704f88f49f7cb4554815
Author: Rihards Prieditis <rprieditis at gmail.com>
Date:   Sat Jan 30 13:53:32 2010 +0100

    l10n: Updated Latvian (lv) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d7cc0e14b70fbaeab9508752658f005acd454447
Author: Denis Koryavov <dkoryavov at yandex.ru>
Date:   Tue Jan 26 23:12:28 2010 +0100

    l10n: Updated Russian (ru) translation to 99%
    
    New status: 225 messages complete with 1 fuzzy and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d7db5ff1dedf021fc3129863ab352b3be3e3576d
Author: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
Date:   Wed Jan 20 22:30:33 2010 +0100

    l10n: Updated Finnish (fi) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 5412764cedfd96b2fbf38ec8b901a4c7ea74afe6
Author: Michal Várady <miko.vaji at gmail.com>
Date:   Tue Jan 19 10:12:29 2010 +0100

    l10n: Updated Czech (cs) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit e4938b57819cb0f09f8b3353ee9ce69c8515f136
Author: Og Maciel <ogmaciel at gnome.org>
Date:   Wed Jan 13 15:35:36 2010 +0100

    l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
    
    New status: 226 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit f9068ec3519ecf1b077f8868a0d997373966d683
Merge: c1a867e65bf68dda3be3d48edcb63d4305192f7e cebe5f8d6dce71dcb8ec7a7d7538081c3fd61ee7
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Jan 10 10:22:34 2010 +0100

    Merge branch 'libxfce4ui' of ssh://git.xfce.org/git/xfce/xfwm4 into libxfce4ui
    
    Conflicts:
    	configure.ac.in

commit c1a867e65bf68dda3be3d48edcb63d4305192f7e
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Jan 10 10:16:26 2010 +0100

    Fix Session-Management stuff a bit. (needs debugging, but it seems to work with libxfce4ui now)

commit 91d5ddea2a9b21282b12dc7e9625a0bde110fca7
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Aug 25 00:15:42 2009 +0200

    Initial commit for removing libxfcegui4 dependency

commit cebe5f8d6dce71dcb8ec7a7d7538081c3fd61ee7
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Aug 25 00:15:42 2009 +0200

    Initial commit for removing libxfcegui4 dependency

 configure.ac.in                               |    9 +-
 settings-dialogs/Makefile.am                  |   36 +-
 settings-dialogs/tweaks-settings.c            |  107 ++--
 settings-dialogs/workspace-settings.c         |   60 +-
 settings-dialogs/xfwm4-dialog.glade           |  874 +++++++++++++------------
 settings-dialogs/xfwm4-settings.c             |  194 +++---
 settings-dialogs/xfwm4-settings.h             |    1 -
 settings-dialogs/xfwm4-tweaks-dialog.glade    |  650 ++++++++++--------
 settings-dialogs/xfwm4-workspace-dialog.glade |  303 +++++----
 src/Makefile.am                               |    4 +-
 src/display.h                                 |    4 +-
 src/events.c                                  |    5 +-
 src/icons.c                                   |    3 +-
 src/main.c                                    |    1 -
 src/session.c                                 |   24 +-
 15 files changed, 1229 insertions(+), 1046 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4c570c5..12d055c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,8 +12,8 @@ m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_ve
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
-m4_define([libxfcegui4_minimum_version], [4.6.0])
-m4_define([libxfce4kbd_private_minimum_version], [4.6.0])
+m4_define([libxfce4ui_minimum_version], [4.7.0])
+m4_define([libxfce4kbd_private_minimum_version], [4.7.0])
 m4_define([xfconf_minimum_version], [4.6.0])
 m4_define([xcomposite_minimum_version], [0.2])
 m4_define([wnck_minimum_version], [2.12])
@@ -70,10 +70,9 @@ AC_CHECK_LIB([Xext], [XShapeCombineShape],
   ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS])
 
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
-XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], libxfcegui4-1.0, [libxfcegui4_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], libxfce4kbd-private-1.0, [libxfce4kbd_private_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], libxfce4ui-1, [libxfce4ui_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], libxfce4kbd-private-2, [libxfce4kbd_private_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCONF], libxfconf-0, [xfconf_minimum_version])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index 739cd10..7c94838 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -18,10 +18,9 @@ xfwm4_workspace_settings_SOURCES = \
 xfwm4_workspace_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
-	$(LIBXFCEGUI4_CFLAGS) \
+	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCONF_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
@@ -32,10 +31,9 @@ xfwm4_workspace_settings_CFLAGS = \
 xfwm4_workspace_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBXFCEGUI4_LIBS) \
+	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCONF_LIBS) \
 	$(LIBWNCK_LIBS)
 
@@ -47,9 +45,8 @@ xfwm4_settings_SOURCES = \
 xfwm4_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
-	$(LIBXFCEGUI4_CFLAGS) \
+	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCE4KBD_PRIVATE_CFLAGS) \
 	$(LIBXFCONF_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
@@ -59,9 +56,8 @@ xfwm4_settings_CFLAGS = \
 xfwm4_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
-	$(LIBXFCEGUI4_LIBS) \
+	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCE4KBD_PRIVATE_LIBS) \
 	$(LIBXFCONF_LIBS)
 
@@ -72,9 +68,8 @@ xfwm4_tweaks_settings_SOURCES = \
 xfwm4_tweaks_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
-	$(LIBXFCEGUI4_CFLAGS) \
+	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCONF_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
@@ -83,9 +78,8 @@ xfwm4_tweaks_settings_CFLAGS = \
 xfwm4_tweaks_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
-	$(LIBXFCEGUI4_LIBS) \
+	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCONF_LIBS)
 
 INCLUDES = \
@@ -95,18 +89,18 @@ if MAINTAINER_MODE
 
 BUILT_SOURCES = \
 monitor-icon.h \
-xfwm4-dialog_glade.h \
-xfwm4-tweaks-dialog_glade.h \
-xfwm4-workspace-dialog_glade.h
+xfwm4-dialog_ui.h \
+xfwm4-tweaks-dialog_ui.h \
+xfwm4-workspace-dialog_ui.h
 
-xfwm4-workspace-dialog_glade.h: xfwm4-workspace-dialog.glade
-	exo-csource --static --strip-comments --strip-content --name=workspace_dialog_glade $< >$@
+xfwm4-workspace-dialog_ui.h: xfwm4-workspace-dialog.glade
+	exo-csource --static --strip-comments --strip-content --name=workspace_dialog_ui $< >$@
 
-xfwm4-dialog_glade.h: xfwm4-dialog.glade
-	exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_glade $< >$@
+xfwm4-dialog_ui.h: xfwm4-dialog.glade
+	exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_ui $< >$@
 
-xfwm4-tweaks-dialog_glade.h: xfwm4-tweaks-dialog.glade
-	exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_glade $< >$@
+xfwm4-tweaks-dialog_ui.h: xfwm4-tweaks-dialog.glade
+	exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_ui $< >$@
 
 monitor-icon.h: $(srcdir)/monitor-icon.png
 	gdk-pixbuf-csource --raw --build-list \
diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index 6fe028e..5e501fe 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -37,11 +37,10 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
-#include "xfwm4-tweaks-dialog_glade.h"
+#include "xfwm4-tweaks-dialog_ui.h"
 
 static GdkNativeWindow opt_socket_id = 0;
 static gboolean opt_version = FALSE;
@@ -143,7 +142,7 @@ cb_urgent_blink_button_toggled (GtkToggleButton *toggle, GtkWidget *repeat_urgen
 }
 
 static void
-wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
+wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
 {
     GtkWidget *vbox;
     GtkTreeIter iter;
@@ -157,53 +156,53 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
     guint n;
 
     /* Cycling tab */
-    GtkWidget *cycle_workspaces_check = glade_xml_get_widget (gxml, "cycle_workspaces_check");
-    GtkWidget *cycle_hidden_check = glade_xml_get_widget (gxml, "cycle_hidden_check");
-    GtkWidget *cycle_minimum_check = glade_xml_get_widget (gxml, "cycle_minimum_check");
-    GtkWidget *cycle_draw_frame = glade_xml_get_widget (gxml, "cycle_draw_frame");
+    GtkWidget *cycle_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_workspaces_check"));
+    GtkWidget *cycle_hidden_check = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_hidden_check"));
+    GtkWidget *cycle_minimum_check = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_minimum_check"));
+    GtkWidget *cycle_draw_frame = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_draw_frame"));
 
     /* Focus tab */
-    GtkWidget *prevent_focus_stealing_check = glade_xml_get_widget (gxml, "prevent_focus_stealing_check");
-    GtkWidget *focus_hint_check = glade_xml_get_widget (gxml, "focus_hint_check");
+    GtkWidget *prevent_focus_stealing_check = GTK_WIDGET (gtk_builder_get_object (builder, "prevent_focus_stealing_check"));
+    GtkWidget *focus_hint_check = GTK_WIDGET (gtk_builder_get_object (builder, "focus_hint_check"));
 
-    GtkWidget *activate_action_bring_option = glade_xml_get_widget (gxml, "activate_action_bring_option");
-    GtkWidget *activate_action_switch_option = glade_xml_get_widget (gxml, "activate_action_switch_option");
-    GtkWidget *activate_action_none_option = glade_xml_get_widget (gxml, "activate_action_none_option");
+    GtkWidget *activate_action_bring_option = GTK_WIDGET (gtk_builder_get_object (builder, "activate_action_bring_option"));
+    GtkWidget *activate_action_switch_option = GTK_WIDGET (gtk_builder_get_object (builder, "activate_action_switch_option"));
+    GtkWidget *activate_action_none_option = GTK_WIDGET (gtk_builder_get_object (builder, "activate_action_none_option"));
 
     /* Accessibility tab */
-    GtkWidget *easy_click_combo_box = glade_xml_get_widget (gxml, "easy_click_combo_box");
-    GtkWidget *raise_with_any_button_check = glade_xml_get_widget (gxml, "raise_with_any_button_check");
-    GtkWidget *borderless_maximize_check = glade_xml_get_widget (gxml, "borderless_maximize_check");
-    GtkWidget *restore_on_move_check = glade_xml_get_widget (gxml, "restore_on_move_check");
-    GtkWidget *snap_resist_check = glade_xml_get_widget (gxml, "snap_resist_check");
-    GtkWidget *urgent_blink = glade_xml_get_widget (gxml, "urgent_blink");
-    GtkWidget *repeat_urgent_blink = glade_xml_get_widget (gxml, "repeat_urgent_blink");
+    GtkWidget *easy_click_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "easy_click_combo_box"));
+    GtkWidget *raise_with_any_button_check = GTK_WIDGET (gtk_builder_get_object (builder, "raise_with_any_button_check"));
+    GtkWidget *borderless_maximize_check = GTK_WIDGET (gtk_builder_get_object (builder, "borderless_maximize_check"));
+    GtkWidget *restore_on_move_check = GTK_WIDGET (gtk_builder_get_object (builder, "restore_on_move_check"));
+    GtkWidget *snap_resist_check = GTK_WIDGET (gtk_builder_get_object (builder, "snap_resist_check"));
+    GtkWidget *urgent_blink = GTK_WIDGET (gtk_builder_get_object (builder, "urgent_blink"));
+    GtkWidget *repeat_urgent_blink = GTK_WIDGET (gtk_builder_get_object (builder, "repeat_urgent_blink"));
 
     /* Workspaces tab */
-    GtkWidget *scroll_workspaces_check = glade_xml_get_widget (gxml, "scroll_workspaces_check");
-    GtkWidget *toggle_workspaces_check = glade_xml_get_widget (gxml, "toggle_workspaces_check");
-    GtkWidget *wrap_layout_check = glade_xml_get_widget (gxml, "wrap_layout_check");
-    GtkWidget *wrap_cycle_check = glade_xml_get_widget (gxml, "wrap_cycle_check");
+    GtkWidget *scroll_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, "scroll_workspaces_check"));
+    GtkWidget *toggle_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, "toggle_workspaces_check"));
+    GtkWidget *wrap_layout_check = GTK_WIDGET (gtk_builder_get_object (builder, "wrap_layout_check"));
+    GtkWidget *wrap_cycle_check = GTK_WIDGET (gtk_builder_get_object (builder, "wrap_cycle_check"));
 
     /* Placement tab */
-    GtkWidget *placement_ratio_scale = (GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "placement_ratio_scale")));
-    GtkWidget *placement_center_option = glade_xml_get_widget (gxml, "placement_center_option");
-    GtkWidget *placement_mouse_option = glade_xml_get_widget (gxml, "placement_mouse_option");
+    GtkWidget *placement_ratio_scale = (GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (GTK_WIDGET (gtk_builder_get_object (builder, "placement_ratio_scale"))));
+    GtkWidget *placement_center_option = GTK_WIDGET (gtk_builder_get_object (builder, "placement_center_option"));
+    GtkWidget *placement_mouse_option = GTK_WIDGET (gtk_builder_get_object (builder, "placement_mouse_option"));
 
     /* Compositing tab */
-    GtkWidget *use_compositing_check = glade_xml_get_widget (gxml, "use_compositing_check");
-    GtkWidget *use_compositing_box = glade_xml_get_widget (gxml, "use_compositing_box");
+    GtkWidget *use_compositing_check = GTK_WIDGET (gtk_builder_get_object (builder, "use_compositing_check"));
+    GtkWidget *use_compositing_box = GTK_WIDGET (gtk_builder_get_object (builder, "use_compositing_box"));
 
-    GtkWidget *unredirect_overlays_check = glade_xml_get_widget (gxml, "unredirect_overlays_check");
-    GtkWidget *show_frame_shadow_check = glade_xml_get_widget (gxml, "show_frame_shadow_check");
-    GtkWidget *show_popup_shadow_check = glade_xml_get_widget (gxml, "show_popup_shadow_check");
-    GtkWidget *show_dock_shadow_check = glade_xml_get_widget (gxml, "show_dock_shadow_check");
+    GtkWidget *unredirect_overlays_check = GTK_WIDGET (gtk_builder_get_object (builder, "unredirect_overlays_check"));
+    GtkWidget *show_frame_shadow_check = GTK_WIDGET (gtk_builder_get_object (builder, "show_frame_shadow_check"));
+    GtkWidget *show_popup_shadow_check = GTK_WIDGET (gtk_builder_get_object (builder, "show_popup_shadow_check"));
+    GtkWidget *show_dock_shadow_check = GTK_WIDGET (gtk_builder_get_object (builder, "show_dock_shadow_check"));
 
-    GtkWidget *frame_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "frame_opacity_scale")));
-    GtkWidget *inactive_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "inactive_opacity_scale")));
-    GtkWidget *move_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "move_opacity_scale")));
-    GtkWidget *popup_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "popup_opacity_scale")));
-    GtkWidget *resize_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "resize_opacity_scale")));
+    GtkWidget *frame_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (GTK_WIDGET (gtk_builder_get_object (builder, "frame_opacity_scale"))));
+    GtkWidget *inactive_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (GTK_WIDGET (gtk_builder_get_object (builder, "inactive_opacity_scale"))));
+    GtkWidget *move_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (GTK_WIDGET (gtk_builder_get_object (builder, "move_opacity_scale"))));
+    GtkWidget *popup_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (GTK_WIDGET (gtk_builder_get_object (builder, "popup_opacity_scale"))));
+    GtkWidget *resize_opacity_scale =(GtkWidget *)gtk_range_get_adjustment (GTK_RANGE (GTK_WIDGET (gtk_builder_get_object (builder, "resize_opacity_scale"))));
 
 
     /* Fill combo-box */
@@ -410,7 +409,7 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
                             G_TYPE_INT,
                             (GObject *)popup_opacity_scale, "value");
 
-    vbox = glade_xml_get_widget (gxml, "main-vbox");
+    vbox = GTK_WIDGET (gtk_builder_get_object (builder, "main-vbox"));
     gtk_widget_show_all (vbox);
 
     g_free (easy_click);
@@ -430,7 +429,7 @@ main (int argc, gchar **argv)
     GtkWidget *dialog;
     GtkWidget *plug;
     GtkWidget *plug_child;
-    GladeXML *gxml;
+    GtkBuilder *builder;
     GError *cli_error = NULL;
     const gchar  *wm_name;
 
@@ -463,18 +462,25 @@ main (int argc, gchar **argv)
 
     xfconf_init (NULL);
 
-    gxml = glade_xml_new_from_buffer (tweaks_dialog_glade,
-                                      tweaks_dialog_glade_length,
-                                      NULL, NULL);
+    builder = gtk_builder_new ();
 
-    if (gxml)
+    gtk_builder_add_from_string (builder, tweaks_dialog_ui, tweaks_dialog_ui_length, NULL);
+
+    if (builder)
     {
-        wm_tweaks_dialog_configure_widgets (gxml);
+        wm_tweaks_dialog_configure_widgets (builder);
 
         if (opt_socket_id == 0)
         {
-            dialog = glade_xml_get_widget (gxml, "main-dialog");
-            gtk_dialog_run (GTK_DIALOG (dialog));
+            dialog = GTK_WIDGET (gtk_builder_get_object (builder, "main-dialog"));
+            gtk_widget_show (dialog);
+            g_signal_connect (dialog, "response", G_CALLBACK (gtk_main_quit), NULL);
+
+            /* To prevent the settings dialog to be saved in the session */
+            gdk_set_sm_client_id ("FAKE ID");
+
+            gtk_main ();
+
             gtk_widget_destroy (dialog);
         }
         else
@@ -485,10 +491,13 @@ main (int argc, gchar **argv)
             gtk_widget_show (plug);
 
             /* Get plug child widget */
-            plug_child = glade_xml_get_widget (gxml, "plug-child");
+            plug_child = GTK_WIDGET (gtk_builder_get_object (builder, "plug-child"));
             gtk_widget_reparent (plug_child, plug);
             gtk_widget_show (plug_child);
 
+            /* To prevent the settings dialog to be saved in the session */
+            gdk_set_sm_client_id ("FAKE ID");
+
             /* Stop startup notification */
             gdk_notify_startup_complete ();
 
@@ -496,7 +505,7 @@ main (int argc, gchar **argv)
             gtk_main ();
         }
 
-        g_object_unref (gxml);
+        g_object_unref (builder);
     }
 
     xfconf_shutdown ();
diff --git a/settings-dialogs/workspace-settings.c b/settings-dialogs/workspace-settings.c
index b7ae774..5e0c5be 100644
--- a/settings-dialogs/workspace-settings.c
+++ b/settings-dialogs/workspace-settings.c
@@ -26,14 +26,13 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <dbus/dbus-glib.h>
 #include <libwnck/libwnck.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
-#include "xfwm4-workspace-dialog_glade.h"
+#include "xfwm4-workspace-dialog_ui.h"
 #include "monitor-icon.h"
 
 #define WORKSPACES_CHANNEL         "xfwm4"
@@ -216,7 +215,7 @@ xfconf_workspace_names_changed(XfconfChannel *channel,
 }
 
 static void
-workspace_dialog_setup_names_treeview(GladeXML *gxml,
+workspace_dialog_setup_names_treeview(GtkBuilder *builder,
                                       XfconfChannel *channel)
 {
     GtkWidget *treeview, *dialog;
@@ -228,13 +227,13 @@ workspace_dialog_setup_names_treeview(GladeXML *gxml,
     GtkTreeIter iter;
     gchar **names;
 
-    dialog = glade_xml_get_widget(gxml, "change_name_dialog");
+    dialog = GTK_WIDGET (gtk_builder_get_object(builder, "change_name_dialog"));
     g_object_set_data(G_OBJECT(dialog), "name-entry",
-                      glade_xml_get_widget(gxml, "entry_name"));
+                      GTK_WIDGET (gtk_builder_get_object(builder, "entry_name")));
     g_signal_connect(G_OBJECT(dialog), "delete-event",
                      G_CALLBACK(gtk_true), NULL);
 
-    treeview = glade_xml_get_widget(gxml, "treeview_ws_names");
+    treeview = GTK_WIDGET (gtk_builder_get_object(builder, "treeview_ws_names"));
 
     ls = gtk_list_store_new(N_COLS, G_TYPE_INT, G_TYPE_STRING);
 
@@ -293,7 +292,7 @@ workspace_dialog_setup_names_treeview(GladeXML *gxml,
 }
 
 static void
-workspace_dialog_configure_widgets (GladeXML *gxml,
+workspace_dialog_configure_widgets (GtkBuilder *builder,
                                     XfconfChannel *channel)
 {
     GtkWidget *vbox;
@@ -303,16 +302,16 @@ workspace_dialog_configure_widgets (GladeXML *gxml,
 
     gint wmax, hmax;
 
-    GtkWidget *workspace_count_spinbutton = glade_xml_get_widget (gxml, "workspace_count_spinbutton");
+    GtkWidget *workspace_count_spinbutton = GTK_WIDGET (gtk_builder_get_object (builder, "workspace_count_spinbutton"));
 
-    GtkWidget *margin_top_spinbutton = glade_xml_get_widget (gxml, "margin_top_spinbutton");
-    GtkWidget *margin_right_spinbutton = glade_xml_get_widget (gxml, "margin_right_spinbutton");
-    GtkWidget *margin_bottom_spinbutton = glade_xml_get_widget (gxml, "margin_bottom_spinbutton");
-    GtkWidget *margin_left_spinbutton = glade_xml_get_widget (gxml, "margin_left_spinbutton");
+    GtkWidget *margin_top_spinbutton = GTK_WIDGET (gtk_builder_get_object (builder, "margin_top_spinbutton"));
+    GtkWidget *margin_right_spinbutton = GTK_WIDGET (gtk_builder_get_object (builder, "margin_right_spinbutton"));
+    GtkWidget *margin_bottom_spinbutton = GTK_WIDGET (gtk_builder_get_object (builder, "margin_bottom_spinbutton"));
+    GtkWidget *margin_left_spinbutton = GTK_WIDGET (gtk_builder_get_object (builder, "margin_left_spinbutton"));
 
     /* Set monitor icon */
-    monitor = xfce_inline_icon_at_size (monitor_icon_data, -1, -1);
-    image = glade_xml_get_widget (gxml, "monitor_icon");
+    monitor = gdk_pixbuf_new_from_inline (-1, monitor_icon_data, TRUE, NULL);
+    image = GTK_WIDGET (gtk_builder_get_object (builder, "monitor_icon"));
     gtk_image_set_from_pixbuf (GTK_IMAGE (image), monitor);
     g_object_unref (monitor);
 
@@ -348,9 +347,9 @@ workspace_dialog_configure_widgets (GladeXML *gxml,
                             G_TYPE_INT,
                             (GObject *)margin_left_spinbutton, "value");
 
-    workspace_dialog_setup_names_treeview(gxml, channel);
+    workspace_dialog_setup_names_treeview(builder, channel);
 
-    vbox = glade_xml_get_widget (gxml, "main-vbox");
+    vbox = GTK_WIDGET (gtk_builder_get_object (builder, "main-vbox"));
 
     gtk_widget_show_all(vbox);
 }
@@ -367,7 +366,7 @@ static GOptionEntry entries[] =
 int
 main(int argc, gchar **argv)
 {
-    GladeXML *gxml;
+    GtkBuilder *builder;
     GtkWidget *dialog;
     GtkWidget *plug;
     GtkWidget *plug_child;
@@ -400,19 +399,21 @@ main(int argc, gchar **argv)
 
     channel = xfconf_channel_get(WORKSPACES_CHANNEL);
 
-    gxml = glade_xml_new_from_buffer (workspace_dialog_glade,
-                                      workspace_dialog_glade_length,
-                                      NULL, NULL);
+    builder = gtk_builder_new();
+    gtk_builder_add_from_string(builder, workspace_dialog_ui, workspace_dialog_ui_length, NULL);
 
-    if(gxml) {
-        workspace_dialog_configure_widgets (gxml, channel);
+    if(builder) {
+        workspace_dialog_configure_widgets (builder, channel);
 
         if(opt_socket_id == 0) {
-            dialog = glade_xml_get_widget (gxml, "main-dialog");
+            dialog = GTK_WIDGET (gtk_builder_get_object (builder, "main-dialog"));
+            gtk_widget_show (dialog);
+            g_signal_connect (dialog, "response", G_CALLBACK (gtk_main_quit), NULL);
 
-            while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP) {
-                /* FIXME: launch help */
-            }
+            /* To prevent the settings dialog to be saved in the session */
+            gdk_set_sm_client_id ("FAKE ID");
+
+            gtk_main ();
 
             gtk_widget_destroy(dialog);
         } else {
@@ -422,10 +423,13 @@ main(int argc, gchar **argv)
             gtk_widget_show (plug);
 
             /* Get plug child widget */
-            plug_child = glade_xml_get_widget (gxml, "plug-child");
+            plug_child = GTK_WIDGET (gtk_builder_get_object (builder, "plug-child"));
             gtk_widget_reparent (plug_child, plug);
             gtk_widget_show (plug_child);
 
+            /* To prevent the settings dialog to be saved in the session */
+            gdk_set_sm_client_id ("FAKE ID");
+
             /* Stop startup notification */
             gdk_notify_startup_complete ();
 
diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index 366c673..6e766e2 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -1,145 +1,168 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Nov 10 13:50:52 2008 -->
-<glade-interface>
-  <requires lib="xfce4"/>
-  <widget class="XfceTitledDialog" id="main-dialog">
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires libxfce4ui 4.5 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">5</property>
+    <property name="lower">5</property>
+    <property name="upper">2000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">5</property>
+    <property name="lower">5</property>
+    <property name="upper">2000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="value">20</property>
+    <property name="lower">5</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="value">20</property>
+    <property name="lower">5</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Window Manager</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon_name">xfwm4</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Configure window behavior and shortcuts</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="main-vbox">
+      <object class="GtkVBox" id="main-vbox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkNotebook" id="plug-child">
+          <object class="GtkNotebook" id="plug-child">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">6</property>
             <child>
-              <widget class="GtkHBox" id="hbox7">
+              <object class="GtkHBox" id="hbox7">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="spacing">12</property>
                 <child>
-                  <widget class="GtkFrame" id="frame13">
+                  <object class="GtkFrame" id="frame13">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment11">
+                      <object class="GtkAlignment" id="alignment11">
                         <property name="visible">True</property>
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                          <object class="GtkScrolledWindow" id="scrolledwindow3">
                             <property name="width_request">200</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <widget class="GtkTreeView" id="theme_name_treeview">
+                              <object class="GtkTreeView" id="theme_name_treeview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="headers_visible">False</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label32">
+                    <child type="label">
+                      <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>_Theme</b></property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="vbox12">
+                  <object class="GtkVBox" id="vbox12">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <widget class="GtkFrame" id="frame10">
+                      <object class="GtkFrame" id="frame10">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment14">
+                          <object class="GtkAlignment" id="alignment14">
                             <property name="visible">True</property>
                             <property name="border_width">6</property>
                             <property name="bottom_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkFontButton" id="title_font_button">
+                              <object class="GtkFontButton" id="title_font_button">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="response_id">0</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label23">
+                        <child type="label">
+                          <object class="GtkLabel" id="label23">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes"><b>Title fon_t</b></property>
                             <property name="use_markup">True</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">title_font_button</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="frame11">
+                      <object class="GtkFrame" id="frame11">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <widget class="GtkAlignment" id="title_align_box">
+                          <object class="GtkAlignment" id="title_align_box">
                             <property name="visible">True</property>
                             <property name="border_width">6</property>
                             <property name="bottom_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkComboBox" id="title_align_combo">
+                              <object class="GtkComboBox" id="title_align_combo">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes"></property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label24">
+                        <child type="label">
+                          <object class="GtkLabel" id="label24">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes"><b>Title _alignment</b></property>
                             <property name="use_markup">True</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">title_align_combo</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -147,120 +170,120 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="frame12">
+                      <object class="GtkFrame" id="frame12">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <widget class="GtkAlignment" id="button_layout_box">
+                          <object class="GtkAlignment" id="button_layout_box">
                             <property name="visible">True</property>
                             <property name="bottom_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkVBox" id="vbox13">
+                              <object class="GtkVBox" id="vbox13">
                                 <property name="visible">True</property>
                                 <property name="border_width">6</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label26">
+                                  <object class="GtkLabel" id="label26">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Click and drag the buttons to change the layout</property>
-                                  </widget>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFrame" id="active-frame">
+                                  <object class="GtkFrame" id="active-frame">
                                     <property name="visible">True</property>
                                     <property name="label_xalign">0</property>
-                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="shadow_type">in</property>
                                     <child>
-                                      <widget class="GtkAlignment" id="alignment17">
+                                      <object class="GtkAlignment" id="alignment17">
                                         <property name="visible">True</property>
                                         <property name="border_width">6</property>
                                         <child>
-                                          <widget class="GtkHBox" id="active-box">
+                                          <object class="GtkHBox" id="active-box">
                                             <property name="height_request">26</property>
                                             <property name="visible">True</property>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-|">
+                                              <object class="GtkButton" id="button-layout-|">
+                                                <property name="label" translatable="yes">Title</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">The window title cannot be removed</property>
-                                                <property name="label" translatable="yes">Title</property>
-                                                <property name="response_id">0</property>
-                                              </widget>
+                                                <property name="tooltip_text" translatable="yes">The window title cannot be removed</property>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label27">
+                                    <child type="label">
+                                      <object class="GtkLabel" id="label27">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">Active</property>
                                         <property name="use_markup">True</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="type">label_item</property>
-                                      </packing>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFrame" id="hidden-frame">
+                                  <object class="GtkFrame" id="hidden-frame">
                                     <property name="visible">True</property>
                                     <property name="label_xalign">0</property>
-                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="shadow_type">in</property>
                                     <child>
-                                      <widget class="GtkAlignment" id="alignment18">
+                                      <object class="GtkAlignment" id="alignment18">
                                         <property name="visible">True</property>
                                         <property name="border_width">6</property>
                                         <child>
-                                          <widget class="GtkHBox" id="hidden-box">
+                                          <object class="GtkHBox" id="hidden-box">
                                             <property name="height_request">26</property>
                                             <property name="visible">True</property>
                                             <property name="spacing">5</property>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-O">
+                                              <object class="GtkButton" id="button-layout-O">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">Menu</property>
-                                                <property name="response_id">0</property>
+                                                <property name="tooltip_text" translatable="yes">Menu</property>
                                                 <child>
-                                                  <widget class="GtkImage" id="image1">
+                                                  <object class="GtkImage" id="image1">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-index</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-T">
+                                              <object class="GtkButton" id="button-layout-T">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">Stick</property>
-                                                <property name="response_id">0</property>
+                                                <property name="tooltip_text" translatable="yes">Stick</property>
                                                 <child>
-                                                  <widget class="GtkImage" id="image2">
+                                                  <object class="GtkImage" id="image2">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-add</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -268,19 +291,18 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-S">
+                                              <object class="GtkButton" id="button-layout-S">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">Shade</property>
-                                                <property name="response_id">0</property>
+                                                <property name="tooltip_text" translatable="yes">Shade</property>
                                                 <child>
-                                                  <widget class="GtkImage" id="image3">
+                                                  <object class="GtkImage" id="image3">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-goto-top</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -288,19 +310,18 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-H">
+                                              <object class="GtkButton" id="button-layout-H">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">Hide</property>
-                                                <property name="response_id">0</property>
+                                                <property name="tooltip_text" translatable="yes">Hide</property>
                                                 <child>
-                                                  <widget class="GtkImage" id="image4">
+                                                  <object class="GtkImage" id="image4">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-undo</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -308,19 +329,18 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-M">
+                                              <object class="GtkButton" id="button-layout-M">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">Maximize</property>
-                                                <property name="response_id">0</property>
+                                                <property name="tooltip_text" translatable="yes">Maximize</property>
                                                 <child>
-                                                  <widget class="GtkImage" id="image5">
+                                                  <object class="GtkImage" id="image5">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-zoom-100</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -328,350 +348,349 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="button-layout-C">
+                                              <object class="GtkButton" id="button-layout-C">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="tooltip" translatable="yes">Close</property>
-                                                <property name="response_id">0</property>
+                                                <property name="tooltip_text" translatable="yes">Close</property>
                                                 <child>
-                                                  <widget class="GtkImage" id="image6">
+                                                  <object class="GtkImage" id="image6">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-close</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
                                                 <property name="position">5</property>
                                               </packing>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label28">
+                                    <child type="label">
+                                      <object class="GtkLabel" id="label28">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">Hidden</property>
                                         <property name="use_markup">True</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="type">label_item</property>
-                                      </packing>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label25">
+                        <child type="label">
+                          <object class="GtkLabel" id="label25">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes"><b>Button layout</b></property>
                             <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Style</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame9">
+              <object class="GtkFrame" id="frame9">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment12">
+                  <object class="GtkAlignment" id="alignment12">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox10">
+                      <object class="GtkVBox" id="vbox10">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                          <object class="GtkScrolledWindow" id="scrolledwindow2">
                             <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="hscrollbar_policy">never</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <widget class="GtkTreeView" id="shortcuts_treeview">
+                              <object class="GtkTreeView" id="shortcuts_treeview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
-                          <widget class="GtkHButtonBox" id="hbuttonbox1">
+                          <object class="GtkHButtonBox" id="hbuttonbox1">
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
-                            <property name="layout_style">GTK_BUTTONBOX_CENTER</property>
+                            <property name="layout_style">center</property>
                             <child>
-                              <widget class="GtkButton" id="shortcuts_clear_button">
+                              <object class="GtkButton" id="shortcuts_clear_button">
+                                <property name="label">gtk-clear</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label">gtk-clear</property>
                                 <property name="use_stock">True</property>
-                                <property name="response_id">0</property>
-                              </widget>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="shortcuts_reset_button">
+                              <object class="GtkButton" id="shortcuts_reset_button">
+                                <property name="label" translatable="yes">_Reset to Defaults</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">_Reset to Defaults</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="pack_type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label22">
+                <child type="label">
+                  <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Window _shortcuts</b></property>
                     <property name="use_markup">True</property>
                     <property name="use_underline">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label2">
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Ke_yboard</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox7">
+              <object class="GtkVBox" id="vbox7">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkFrame" id="frame5">
+                  <object class="GtkFrame" id="frame5">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment7">
+                      <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox14">
+                          <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox3">
+                              <object class="GtkHBox" id="hbox3">
                                 <property name="visible">True</property>
                                 <property name="spacing">12</property>
                                 <property name="homogeneous">True</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="click_to_focus_radio">
+                                  <object class="GtkRadioButton" id="click_to_focus_radio">
+                                    <property name="label" translatable="yes">Clic_k to focus</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Clic_k to focus</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkRadioButton" id="focus_follows_mouse_radio">
+                                  <object class="GtkRadioButton" id="focus_follows_mouse_radio">
+                                    <property name="label" translatable="yes">Focus follows _mouse</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Focus follows _mouse</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
                                     <property name="group">click_to_focus_radio</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label29">
+                              <object class="GtkLabel" id="label29">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Delay before window receives focus:</property>
                                 <property name="use_markup">True</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">focus_delay_scale</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkAlignment" id="alignment19">
+                              <object class="GtkAlignment" id="alignment19">
                                 <property name="visible">True</property>
                                 <property name="left_padding">12</property>
                                 <child>
-                                  <widget class="GtkHBox" id="focus_delay_hbox">
+                                  <object class="GtkHBox" id="focus_delay_hbox">
                                     <property name="visible">True</property>
                                     <property name="spacing">12</property>
                                     <child>
-                                      <widget class="GtkLabel" id="label30">
+                                      <object class="GtkLabel" id="label30">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes" context="yes">Delay|<i>Short</i></property>
                                         <property name="use_markup">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkHScale" id="focus_delay_scale">
+                                      <object class="GtkHScale" id="focus_delay_scale">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                        <property name="adjustment">5 5 2000 1 10 0</property>
+                                        <property name="update_policy">discontinuous</property>
+                                        <property name="adjustment">adjustment1</property>
                                         <property name="draw_value">False</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label31">
+                                      <object class="GtkLabel" id="label31">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes" context="yes">Delay|<i>Long</i></property>
                                         <property name="use_markup">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label15">
+                    <child type="label">
+                      <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Focus model</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame6">
+                  <object class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment8">
+                      <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkCheckButton" id="focus_new_check">
+                          <object class="GtkCheckButton" id="focus_new_check">
+                            <property name="label" translatable="yes" context="yes">Automatically give focus to _newly created windows</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes" context="yes">Automatically give focus to _newly created windows</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label16">
+                    <child type="label">
+                      <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>New window focus</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -679,117 +698,121 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame7">
+                  <object class="GtkFrame" id="frame7">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment9">
+                      <object class="GtkAlignment" id="alignment9">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox8">
+                          <object class="GtkVBox" id="vbox8">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkCheckButton" id="raise_on_focus_check">
+                              <object class="GtkCheckButton" id="raise_on_focus_check">
+                                <property name="label" translatable="yes" context="yes">Automatically _raise windows when they receive focus</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Automatically _raise windows when they receive focus</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox9">
+                              <object class="GtkVBox" id="vbox9">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label19">
+                                  <object class="GtkLabel" id="label19">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Delay _before raising focused window:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">focus_raise_delay_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment1">
+                                  <object class="GtkAlignment" id="alignment1">
                                     <property name="visible">True</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox4">
+                                      <object class="GtkHBox" id="hbox4">
                                         <property name="visible">True</property>
                                         <property name="spacing">12</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label20">
+                                          <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes">Delay|<i>Short</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="focus_raise_delay_scale">
+                                          <object class="GtkHScale" id="focus_raise_delay_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">5 5 2000 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment2</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label21">
+                                          <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes">Delay|<i>Long</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label17">
+                    <child type="label">
+                      <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Raise on focus</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -797,105 +820,104 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame8">
+                  <object class="GtkFrame" id="frame8">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment10">
+                      <object class="GtkAlignment" id="alignment10">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkCheckButton" id="raise_on_click_check">
+                          <object class="GtkCheckButton" id="raise_on_click_check">
+                            <property name="label" translatable="yes" context="yes">Raise window when clicking _inside application window</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes" context="yes">Raise window when clicking _inside application window</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label18">
+                    <child type="label">
+                      <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Raise on click</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label3">
+            <child type="tab">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes" context="yes">_Focus</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkFrame" id="frame1">
+                  <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment2">
+                      <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox2">
+                          <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkCheckButton" id="snap_to_border_check">
+                              <object class="GtkCheckButton" id="snap_to_border_check">
+                                <property name="label" translatable="yes" context="yes">Snap windows to screen _border</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Snap windows to screen _border</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="snap_to_window_check">
+                              <object class="GtkCheckButton" id="snap_to_window_check">
+                                <property name="label" translatable="yes" context="yes">Snap windows to other _windows</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Snap windows to other _windows</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -903,382 +925,394 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox5">
+                              <object class="GtkVBox" id="vbox5">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label9">
+                                  <object class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Dis_tance:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">snap_width_scale</property>
-                                  </widget>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment6">
+                                  <object class="GtkAlignment" id="alignment6">
                                     <property name="visible">True</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox1">
+                                      <object class="GtkHBox" id="hbox1">
                                         <property name="visible">True</property>
                                         <property name="spacing">12</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label11">
+                                          <object class="GtkLabel" id="label11">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes">Distance|<i>Small</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="snap_width_scale">
+                                          <object class="GtkHScale" id="snap_width_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">20 5 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment3</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label12">
+                                          <object class="GtkLabel" id="label12">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes">Distance|<i>Wide</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label5">
+                    <child type="label">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Windows snapping</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame2">
+                  <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment3">
+                      <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox4">
+                          <object class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkCheckButton" id="wrap_workspaces_check">
+                              <object class="GtkCheckButton" id="wrap_workspaces_check">
+                                <property name="label" translatable="yes" context="yes">Wrap workspaces when the _pointer reaches the screen edge</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Wrap workspaces when the _pointer reaches the screen edge</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="wrap_windows_check">
+                              <object class="GtkCheckButton" id="wrap_windows_check">
+                                <property name="label" translatable="yes" context="yes">Wrap workspaces when _dragging a window off the screen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Wrap workspaces when _dragging a window off the screen</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox6">
+                              <object class="GtkVBox" id="vbox6">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label10">
+                                  <object class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">_Edge resistance:</property>
                                     <property name="use_underline">True</property>
                                     <property name="selectable">True</property>
                                     <property name="mnemonic_widget">wrap_resistance_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment3">
+                                  <object class="GtkAlignment" id="alignment4">
                                     <property name="visible">True</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox2">
+                                      <object class="GtkHBox" id="hbox2">
                                         <property name="visible">True</property>
                                         <property name="spacing">12</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label13">
+                                          <object class="GtkLabel" id="label13">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes">Resistance|<i>Small</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="wrap_resistance_scale">
+                                          <object class="GtkHScale" id="wrap_resistance_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">20 5 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment4</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label14">
+                                          <object class="GtkLabel" id="label14">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes">Resistance|<i>Wide</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label6">
+                    <child type="label">
+                      <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Wrap workspaces</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame3">
+                  <object class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment4">
+                      <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox3">
+                          <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkCheckButton" id="box_resize_check">
+                              <object class="GtkCheckButton" id="box_resize_check">
+                                <property name="label" translatable="yes" context="yes">Hide content of windows when _resizing</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Hide content of windows when _resizing</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="box_move_check">
+                              <object class="GtkCheckButton" id="box_move_check">
+                                <property name="label" translatable="yes" context="yes">Hide content of windows when _moving</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Hide content of windows when _moving</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label7">
+                    <child type="label">
+                      <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Box move and resize</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame4">
+                  <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment5">
+                      <object class="GtkAlignment" id="alignment13">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkComboBox" id="double_click_action_combo">
+                          <object class="GtkComboBox" id="double_click_action_combo">
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes" context="yes">The action to perform when the title-bar is double-clicked</property>
-                            <property name="items" translatable="yes" context="yes">  </property>
-                          </widget>
+                            <property name="tooltip_text" translatable="yes" context="yes">The action to perform when the title-bar is double-clicked</property>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label8">
+                    <child type="label">
+                      <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes" context="yes"><b>Double click _action</b></property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">double_click_action_combo</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label4">
+            <child type="tab">
+              <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes" context="yes">Ad_vanced</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
-              <widget class="GtkButton" id="help_button">
+              <object class="GtkButton" id="help_button">
+                <property name="label" context="yes">gtk-help</property>
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" context="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="close_button">
+              <object class="GtkButton" id="close_button">
+                <property name="label" context="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" context="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="0">help_button</action-widget>
+      <action-widget response="0">close_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
index 2643fc9..120a226 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -37,15 +37,14 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
 #include <libxfce4kbd-private/xfce-shortcut-dialog.h>
 #include <libxfce4kbd-private/xfce-shortcuts-provider.h>
 
-#include "xfwm4-dialog_glade.h"
+#include "xfwm4-dialog_ui.h"
 #include "xfwm4-settings.h"
 
 
@@ -75,7 +74,7 @@ typedef struct _ShortcutTemplate ShortcutTemplate;
 enum
 {
   PROP_0,
-  PROP_GLADE_XML,
+  PROP_GTK_BUILDER,
 };
 
 
@@ -188,7 +187,7 @@ static void       xfwm_settings_shortcut_row_activated               (GtkTreeVie
 
 struct _XfwmSettingsPrivate
 {
-  GladeXML              *glade_xml;
+  GtkBuilder            *builder;
   XfceShortcutsProvider *provider;
   XfconfChannel         *wm_channel;
 };
@@ -363,11 +362,11 @@ xfwm_settings_class_init (XfwmSettingsClass *klass)
   gobject_class->set_property = xfwm_settings_set_property;
 
   g_object_class_install_property (gobject_class,
-                                   PROP_GLADE_XML,
-                                   g_param_spec_object ("glade-xml",
-                                                        "glade-xml",
-                                                        "glade-xml",
-                                                        GLADE_TYPE_XML,
+                                   PROP_GTK_BUILDER,
+                                   g_param_spec_object ("gtk-builder",
+                                                        "gtk-builder",
+                                                        "gtk-builder",
+                                                        GTK_TYPE_BUILDER,
                                                         G_PARAM_CONSTRUCT_ONLY |
                                                         G_PARAM_WRITABLE));
 }
@@ -379,7 +378,7 @@ xfwm_settings_init (XfwmSettings *settings)
 {
   settings->priv = XFWM_SETTINGS_GET_PRIVATE (settings);
 
-  settings->priv->glade_xml = NULL;
+  settings->priv->builder = NULL;
   settings->priv->provider = xfce_shortcuts_provider_new ("xfwm4");
   settings->priv->wm_channel = xfconf_channel_new ("xfwm4");
 }
@@ -428,13 +427,13 @@ xfwm_settings_constructed (GObject *object)
   const gchar        *name;
 
   /* Style tab widgets */
-  theme_name_treeview = glade_xml_get_widget (settings->priv->glade_xml, "theme_name_treeview");
-  title_font_button = glade_xml_get_widget (settings->priv->glade_xml, "title_font_button");
-  title_align_combo = glade_xml_get_widget (settings->priv->glade_xml, "title_align_combo");
-  active_frame = glade_xml_get_widget (settings->priv->glade_xml, "active-frame");
-  active_box = glade_xml_get_widget (settings->priv->glade_xml, "active-box");
-  hidden_frame = glade_xml_get_widget (settings->priv->glade_xml, "hidden-frame");
-  hidden_box = glade_xml_get_widget (settings->priv->glade_xml, "hidden-box");
+  theme_name_treeview = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "theme_name_treeview"));
+  title_font_button = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "title_font_button"));
+  title_align_combo = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "title_align_combo"));
+  active_frame = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-frame"));
+  active_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box"));
+  hidden_frame = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "hidden-frame"));
+  hidden_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "hidden-box"));
 
   /* Style tab: theme name */
   {
@@ -575,11 +574,11 @@ xfwm_settings_constructed (GObject *object)
   g_value_unset (&value);
 
   /* Keyboard tab widgets */
-  shortcuts_treeview = glade_xml_get_widget (settings->priv->glade_xml, "shortcuts_treeview");
-  shortcuts_clear_button = glade_xml_get_widget (settings->priv->glade_xml,
-                                                 "shortcuts_clear_button");
-  shortcuts_reset_button = glade_xml_get_widget (settings->priv->glade_xml,
-                                                 "shortcuts_reset_button");
+  shortcuts_treeview = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "shortcuts_treeview"));
+  shortcuts_clear_button = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                       "shortcuts_clear_button"));
+  shortcuts_reset_button = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                       "shortcuts_reset_button"));
 
   /* Set reset button icon */
   gtk_button_set_image (GTK_BUTTON (shortcuts_reset_button),
@@ -616,12 +615,12 @@ xfwm_settings_constructed (GObject *object)
                     G_CALLBACK (xfwm_settings_shortcut_reset_clicked), settings);
 
   /* Focus tab widgets */
-  focus_delay_scale = glade_xml_get_widget (settings->priv->glade_xml, "focus_delay_scale");
-  focus_raise_delay_scale = glade_xml_get_widget (settings->priv->glade_xml, "focus_raise_delay_scale");
-  focus_new_check = glade_xml_get_widget (settings->priv->glade_xml, "focus_new_check");
-  raise_on_focus_check = glade_xml_get_widget (settings->priv->glade_xml, "raise_on_focus_check");
-  raise_on_click_check = glade_xml_get_widget (settings->priv->glade_xml, "raise_on_click_check");
-  click_to_focus_radio = glade_xml_get_widget (settings->priv->glade_xml, "click_to_focus_radio");
+  focus_delay_scale = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "focus_delay_scale"));
+  focus_raise_delay_scale = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "focus_raise_delay_scale"));
+  focus_new_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "focus_new_check"));
+  raise_on_focus_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "raise_on_focus_check"));
+  raise_on_click_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "raise_on_click_check"));
+  click_to_focus_radio = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "click_to_focus_radio"));
 
   /* Focus tab */
   xfconf_g_property_bind (settings->priv->wm_channel, "/general/focus_delay", G_TYPE_INT,
@@ -646,18 +645,18 @@ xfwm_settings_constructed (GObject *object)
   g_value_unset (&value);
 
   /* Advanced tab widgets */
-  box_move_check = glade_xml_get_widget (settings->priv->glade_xml, "box_move_check");
-  box_resize_check = glade_xml_get_widget (settings->priv->glade_xml, "box_resize_check");
-  wrap_workspaces_check = glade_xml_get_widget (settings->priv->glade_xml,
-                                                "wrap_workspaces_check");
-  wrap_windows_check = glade_xml_get_widget (settings->priv->glade_xml, "wrap_windows_check");
-  snap_to_border_check = glade_xml_get_widget (settings->priv->glade_xml, "snap_to_border_check");
-  snap_to_window_check = glade_xml_get_widget (settings->priv->glade_xml, "snap_to_window_check");
-  double_click_action_combo = glade_xml_get_widget (settings->priv->glade_xml,
-                                                    "double_click_action_combo");
-  snap_width_scale = glade_xml_get_widget (settings->priv->glade_xml, "snap_width_scale");
-  wrap_resistance_scale = glade_xml_get_widget (settings->priv->glade_xml,
-                                                "wrap_resistance_scale");
+  box_move_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "box_move_check"));
+  box_resize_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "box_resize_check"));
+  wrap_workspaces_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                      "wrap_workspaces_check"));
+  wrap_windows_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "wrap_windows_check"));
+  snap_to_border_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "snap_to_border_check"));
+  snap_to_window_check = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "snap_to_window_check"));
+  double_click_action_combo = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                          "double_click_action_combo"));
+  snap_width_scale = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "snap_width_scale"));
+  wrap_resistance_scale = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                      "wrap_resistance_scale"));
 
   /* Advanced tab: double click action */
   {
@@ -730,7 +729,7 @@ xfwm_settings_finalize (GObject *object)
 
   g_object_unref (settings->priv->wm_channel);
   g_object_unref (settings->priv->provider);
-  g_object_unref (settings->priv->glade_xml);
+  g_object_unref (settings->priv->builder);
 
   (*G_OBJECT_CLASS (xfwm_settings_parent_class)->finalize) (object);
 }
@@ -747,8 +746,8 @@ xfwm_settings_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_GLADE_XML:
-      g_value_set_object (value, settings->priv->glade_xml);
+    case PROP_GTK_BUILDER:
+      g_value_set_object (value, settings->priv->builder);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -768,11 +767,11 @@ xfwm_settings_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_GLADE_XML:
-      if (GLADE_IS_XML (settings->priv->glade_xml))
-        g_object_unref (settings->priv->glade_xml);
-      settings->priv->glade_xml = g_value_get_object (value);
-      g_object_notify (object, "glade-xml");
+    case PROP_GTK_BUILDER:
+      if (GTK_IS_BUILDER (settings->priv->builder))
+        g_object_unref (settings->priv->builder);
+      settings->priv->builder = g_value_get_object (value);
+      g_object_notify (object, "gtk-builder");
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -786,12 +785,14 @@ XfwmSettings *
 xfwm_settings_new (void)
 {
   XfwmSettings *settings = NULL;
-  GladeXML     *glade_xml;
+  GtkBuilder   *builder;
 
-  glade_xml = glade_xml_new_from_buffer (xfwm4_dialog_glade, xfwm4_dialog_glade_length, NULL, NULL);
+  builder = gtk_builder_new ();
 
-  if (G_LIKELY (glade_xml != NULL))
-    settings = g_object_new (XFWM_TYPE_SETTINGS, "glade-xml", glade_xml, NULL);
+  gtk_builder_add_from_string (builder, xfwm4_dialog_ui, xfwm4_dialog_ui_length, NULL);
+
+  if (G_LIKELY (builder != NULL))
+    settings = g_object_new (XFWM_TYPE_SETTINGS, "gtk-builder", builder, NULL);
 
 #if !GLIB_CHECK_VERSION (2,14,0)
   xfwm_settings_constructed (G_OBJECT(settings));
@@ -842,7 +843,7 @@ xfwm_settings_load_themes (XfwmSettings *settings)
 
   themes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
-  view = glade_xml_get_widget (settings->priv->glade_xml, "theme_name_treeview");
+  view = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "theme_name_treeview"));
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
 
   xfce_resource_push_path (XFCE_RESOURCE_THEMES, DATADIR G_DIR_SEPARATOR_S "themes");
@@ -877,8 +878,13 @@ xfwm_settings_load_themes (XfwmSettings *settings)
 
               if (G_UNLIKELY (g_str_equal (active_theme_name, file)))
                 {
+                  GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
+
                   gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (view)),
                                                   &iter);
+                  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (view), path, NULL, TRUE, 0.5, 0.5);
+
+                  gtk_tree_path_free (path);
                 }
             }
 
@@ -899,7 +905,7 @@ static GtkWidget *
 xfwm_settings_create_dialog (XfwmSettings *settings)
 {
   g_return_val_if_fail (XFWM_IS_SETTINGS (settings), NULL);
-  return glade_xml_get_widget (settings->priv->glade_xml, "main-dialog");
+  return GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "main-dialog"));
 }
 
 
@@ -916,7 +922,7 @@ xfwm_settings_create_plug (XfwmSettings   *settings,
   plug = gtk_plug_new (socket_id);
   gtk_widget_show (plug);
 
-  child = glade_xml_get_widget (settings->priv->glade_xml, "plug-child");
+  child = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "plug-child"));
   gtk_widget_reparent (child, plug);
   gtk_widget_show (child);
 
@@ -987,7 +993,14 @@ main (int    argc,
   if (G_UNLIKELY (opt_socket_id == 0))
     {
       dialog = xfwm_settings_create_dialog (settings);
-      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_show (dialog);
+      g_signal_connect (dialog, "response", G_CALLBACK (gtk_main_quit), NULL);
+
+      /* To prevent the settings dialog to be saved in the session */
+      gdk_set_sm_client_id ("FAKE ID");
+
+      gtk_main ();
+
       gtk_widget_destroy (dialog);
     }
   else
@@ -995,6 +1008,9 @@ main (int    argc,
       plug = xfwm_settings_create_plug (settings, opt_socket_id);
       g_signal_connect (plug, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
 
+      /* To prevent the settings dialog to be saved in the session */
+      gdk_set_sm_client_id ("FAKE ID");
+
       /* Stop startup notification */
       gdk_notify_startup_complete ();
 
@@ -1045,10 +1061,10 @@ xfwm_settings_theme_selection_changed (GtkTreeSelection *selection,
         }
     }
 
-  widget = glade_xml_get_widget (settings->priv->glade_xml, "button_layout_box");
+  widget = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "button_layout_box"));
   gtk_widget_set_sensitive (widget, button_layout);
 
-  widget = glade_xml_get_widget (settings->priv->glade_xml, "title_align_box");
+  widget = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "title_align_box"));
   gtk_widget_set_sensitive (widget, title_alignment);
 }
 
@@ -1096,15 +1112,15 @@ xfwm_settings_active_frame_drag_data (GtkWidget        *widget,
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  source = glade_xml_get_widget (settings->priv->glade_xml,
+  source = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
 #if GTK_CHECK_VERSION (2,14,0)
-                                 (const gchar *)gtk_selection_data_get_data (data));
+                                 (const gchar *)gtk_selection_data_get_data (data)));
 #else
-                                 (const gchar *) data->data);
+                                 (const gchar *) data->data));
 #endif
   parent = gtk_widget_get_parent (source);
 
-  active_box = glade_xml_get_widget (settings->priv->glade_xml, "active-box");
+  active_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box"));
 
   g_object_ref (source);
   gtk_container_remove (GTK_CONTAINER (parent), source);
@@ -1151,7 +1167,7 @@ xfwm_settings_active_frame_drag_motion (GtkWidget      *widget,
 
   g_return_val_if_fail (XFWM_IS_SETTINGS (settings), FALSE);
 
-  active_box = glade_xml_get_widget (settings->priv->glade_xml, "active-box");
+  active_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box"));
   children = gtk_container_get_children (GTK_CONTAINER (active_box));
 
   /* Set a value so that the compiler does not (rightfully) complain */
@@ -1201,7 +1217,7 @@ xfwm_settings_active_frame_drag_leave (GtkWidget      *widget,
 {
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  xfwm_settings_delete_indicator (glade_xml_get_widget (settings->priv->glade_xml, "active-box"));
+  xfwm_settings_delete_indicator (GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box")));
 }
 
 
@@ -1223,16 +1239,16 @@ xfwm_settings_hidden_frame_drag_data (GtkWidget        *widget,
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  source = glade_xml_get_widget (settings->priv->glade_xml,
+  source = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
 #if GTK_CHECK_VERSION (2,14,0)
-                                 (const gchar *)gtk_selection_data_get_data (data));
+                                 (const gchar *)gtk_selection_data_get_data (data)));
 #else
-                                 (const gchar *) data->data);
+                                 (const gchar *) data->data));
 #endif
   parent = gtk_widget_get_parent (source);
 
-  hidden_box = glade_xml_get_widget (settings->priv->glade_xml, "hidden-box");
-  active_box = glade_xml_get_widget (settings->priv->glade_xml, "active-box");
+  hidden_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "hidden-box"));
+  active_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box"));
 
   if (G_UNLIKELY (parent == hidden_box))
     return;
@@ -1407,8 +1423,8 @@ xfwm_settings_button_layout_property_changed (XfconfChannel *channel,
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  hidden_box = glade_xml_get_widget (settings->priv->glade_xml, "hidden-box");
-  active_box = glade_xml_get_widget (settings->priv->glade_xml, "active-box");
+  hidden_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "hidden-box"));
+  active_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box"));
 
   gtk_widget_set_app_paintable (active_box, FALSE);
   gtk_widget_set_app_paintable (hidden_box, FALSE);
@@ -1474,7 +1490,7 @@ xfwm_settings_title_alignment_property_changed (XfconfChannel *channel,
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  combo = glade_xml_get_widget (settings->priv->glade_xml, "title_align_combo");
+  combo = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "title_align_combo"));
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
 
   if (gtk_tree_model_get_iter_first (model, &iter))
@@ -1593,7 +1609,7 @@ xfwm_settings_double_click_action_property_changed (XfconfChannel *channel,
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
 
-  combo = glade_xml_get_widget (settings->priv->glade_xml, "double_click_action_combo");
+  combo = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "double_click_action_combo"));
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
 
   if (G_UNLIKELY (G_VALUE_TYPE (value) == G_TYPE_INVALID))
@@ -1633,14 +1649,14 @@ xfwm_settings_click_to_focus_property_changed (XfconfChannel *channel,
   GtkWidget *focus_delay_hbox;
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
-  g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
+  g_return_if_fail (GTK_IS_BUILDER (settings->priv->builder));
 
-  click_to_focus_radio = glade_xml_get_widget (settings->priv->glade_xml,
-                                               "click_to_focus_radio");
-  focus_follows_mouse_radio = glade_xml_get_widget (settings->priv->glade_xml,
-                                                    "focus_follows_mouse_radio");
-  focus_delay_hbox = glade_xml_get_widget (settings->priv->glade_xml,
-                                           "focus_delay_hbox");
+  click_to_focus_radio = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                     "click_to_focus_radio"));
+  focus_follows_mouse_radio = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                          "focus_follows_mouse_radio"));
+  focus_delay_hbox = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder,
+                                 "focus_delay_hbox"));
 
   if (G_UNLIKELY (G_VALUE_TYPE (value) != G_TYPE_BOOLEAN))
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (click_to_focus_radio), TRUE);
@@ -1668,9 +1684,9 @@ xfwm_settings_initialize_shortcuts (XfwmSettings *settings)
   gint          i;
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
-  g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
+  g_return_if_fail (GTK_IS_BUILDER (settings->priv->builder));
 
-  view = glade_xml_get_widget (settings->priv->glade_xml, "shortcuts_treeview");
+  view = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "shortcuts_treeview"));
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
 
   gtk_list_store_clear (GTK_LIST_STORE (model));
@@ -1695,9 +1711,9 @@ xfwm_settings_clear_shortcuts_view (XfwmSettings *settings)
   GtkWidget    *view;
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
-  g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
+  g_return_if_fail (GTK_IS_BUILDER (settings->priv->builder));
 
-  view = glade_xml_get_widget (settings->priv->glade_xml, "shortcuts_treeview");
+  view = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "shortcuts_treeview"));
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
 
   if (G_LIKELY (gtk_tree_model_get_iter_first (model, &iter)))
@@ -1751,10 +1767,10 @@ xfwm_settings_reload_shortcuts (XfwmSettings *settings)
   GList        *shortcuts;
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
-  g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
+  g_return_if_fail (GTK_IS_BUILDER (settings->priv->builder));
   g_return_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (settings->priv->provider));
 
-  view = glade_xml_get_widget (settings->priv->glade_xml, "shortcuts_treeview");
+  view = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "shortcuts_treeview"));
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
 
   xfwm_settings_clear_shortcuts_view (settings);
@@ -1803,10 +1819,10 @@ xfwm_settings_shortcut_clear_clicked (GtkButton    *button,
   gchar            *shortcut;
 
   g_return_if_fail (XFWM_IS_SETTINGS (settings));
-  g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml));
+  g_return_if_fail (GTK_IS_BUILDER (settings->priv->builder));
   g_return_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (settings->priv->provider));
 
-  view = glade_xml_get_widget (settings->priv->glade_xml, "shortcuts_treeview");
+  view = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "shortcuts_treeview"));
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
   rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
diff --git a/settings-dialogs/xfwm4-settings.h b/settings-dialogs/xfwm4-settings.h
index 6032a5e..67fe565 100644
--- a/settings-dialogs/xfwm4-settings.h
+++ b/settings-dialogs/xfwm4-settings.h
@@ -22,7 +22,6 @@
 #define __XFWM_SETTINGS_H__
 
 #include <glib-object.h>
-#include <glade/glade.h>
 
 G_BEGIN_DECLS;
 
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 2e2b9ff..d6070b3 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -1,53 +1,92 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Oct 31 11:02:59 2008 -->
-<glade-interface>
-  <requires lib="xfce4"/>
-  <widget class="XfceTitledDialog" id="main-dialog">
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires libxfce4ui 4.5 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">75</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">90</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="value">90</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="value">90</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment5">
+    <property name="value">90</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="value">90</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Window Manager Tweaks</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="default_height">480</property>
     <property name="icon_name">wmtweaks</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Fine-tune window behaviour and effects</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="main-vbox">
+      <object class="GtkVBox" id="main-vbox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <widget class="GtkNotebook" id="plug-child">
+          <object class="GtkNotebook" id="plug-child">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">6</property>
             <child>
-              <widget class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkCheckButton" id="cycle_minimum_check">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                  <object class="GtkCheckButton" id="cycle_minimum_check">
                     <property name="label" translatable="yes">_Skip windows that have "skip pager"
 or "skip taskbar" properties set</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cycle_hidden_check">
+                  <object class="GtkCheckButton" id="cycle_hidden_check">
+                    <property name="label" translatable="yes">_Include hidden (i.e. iconified) windows</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Include hidden (i.e. iconified) windows</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -55,14 +94,14 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cycle_workspaces_check">
+                  <object class="GtkCheckButton" id="cycle_workspaces_check">
+                    <property name="label" translatable="yes">Cycle _through windows on all workspaces</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Cycle _through windows on all workspaces</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -70,61 +109,62 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cycle_draw_frame">
+                  <object class="GtkCheckButton" id="cycle_draw_frame">
+                    <property name="label" translatable="yes">_Draw frame around selected windows while cycling</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Draw frame around selected windows while cycling</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">C_ycling</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox3">
+              <object class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkCheckButton" id="prevent_focus_stealing_check">
+                  <object class="GtkCheckButton" id="prevent_focus_stealing_check">
+                    <property name="label" translatable="yes">Activate _focus stealing prevention</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Activate _focus stealing prevention</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="focus_hint_check">
+                  <object class="GtkCheckButton" id="focus_hint_check">
+                    <property name="label" translatable="yes">Honor _standard ICCCM focus hint</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Honor _standard ICCCM focus hint</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -132,146 +172,155 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="prevent_focus_stealing_box">
+                  <object class="GtkVBox" id="prevent_focus_stealing_box">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <widget class="GtkLabel" id="label11">
+                      <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">When a window raises itself:</property>
-                      </widget>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment2">
+                      <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox14">
+                          <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
                             <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkRadioButton" id="activate_action_bring_option">
+                              <object class="GtkRadioButton" id="activate_action_bring_option">
+                                <property name="label" translatable="yes">_Bring window on current workspace</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">_Bring window on current workspace</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="activate_action_switch_option">
+                              <object class="GtkRadioButton" id="activate_action_switch_option">
+                                <property name="label" translatable="yes">Switch to win_dow's workspace</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Switch to win_dow's workspace</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">activate_action_bring_option</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="activate_action_none_option">
+                              <object class="GtkRadioButton" id="activate_action_none_option">
+                                <property name="label" translatable="yes">Do _nothing</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Do _nothing</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">activate_action_bring_option</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label2">
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Focus</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox4">
+              <object class="GtkVBox" id="vbox4">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox1">
+                  <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="spacing">12</property>
                     <child>
-                      <widget class="GtkLabel" id="label7">
+                      <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Key used to _grab and move windows:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">easy_click_combo_box</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBox" id="easy_click_combo_box">
+                      <object class="GtkComboBox" id="easy_click_combo_box">
                         <property name="visible">True</property>
-                        <property name="items" translatable="yes"></property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="raise_with_any_button_check">
+                  <object class="GtkCheckButton" id="raise_with_any_button_check">
+                    <property name="label" translatable="yes">_Raise windows when any mouse button is pressed</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">_Raise windows when any mouse button is pressed</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -279,14 +328,14 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="borderless_maximize_check">
+                  <object class="GtkCheckButton" id="borderless_maximize_check">
+                    <property name="label" translatable="yes">Hide _frame of windows when maximized</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Hide _frame of windows when maximized</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -294,14 +343,14 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="restore_on_move_check">
+                  <object class="GtkCheckButton" id="restore_on_move_check">
+                    <property name="label" translatable="yes">Restore original _size of maximized windows when moving</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Restore original _size of maximized windows when moving</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -309,14 +358,14 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="snap_resist_check">
+                  <object class="GtkCheckButton" id="snap_resist_check">
+                    <property name="label" translatable="yes">Use _edge resistance instead of window snapping</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Use _edge resistance instead of window snapping</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -324,14 +373,14 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="urgent_blink">
+                  <object class="GtkCheckButton" id="urgent_blink">
+                    <property name="label" translatable="yes">Notify of _urgency by making window's decoration blink</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Notify of _urgency by making window's decoration blink</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -339,66 +388,67 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="repeat_urgent_blink">
+                  <object class="GtkCheckButton" id="repeat_urgent_blink">
+                    <property name="label" translatable="yes">Keep urgent windows _blinking repeatedly</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Keep urgent windows _blinking repeatedly</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">6</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label3">
+            <child type="tab">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Accessibility</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox5">
+              <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkCheckButton" id="scroll_workspaces_check">
+                  <object class="GtkCheckButton" id="scroll_workspaces_check">
+                    <property name="label" translatable="yes">Use the _mouse wheel on the desktop to switch workspaces</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Use the _mouse wheel on the desktop to switch workspaces</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="toggle_workspaces_check">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                  <object class="GtkCheckButton" id="toggle_workspaces_check">
                     <property name="label" translatable="yes">_Remember and recall previous workspace
 when switching via keyboard shortcuts</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -406,14 +456,14 @@ when switching via keyboard shortcuts</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="wrap_layout_check">
+                  <object class="GtkCheckButton" id="wrap_layout_check">
+                    <property name="label" translatable="yes">Wrap workspaces depending on the actual desktop _layout</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Wrap workspaces depending on the actual desktop _layout</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -421,100 +471,102 @@ when switching via keyboard shortcuts</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="wrap_cycle_check">
+                  <object class="GtkCheckButton" id="wrap_cycle_check">
+                    <property name="label" translatable="yes">Wrap workspaces when the _first or the last workspace is reached</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Wrap workspaces when the _first or the last workspace is reached</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label4">
+            <child type="tab">
+              <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Workspaces</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox6">
+              <object class="GtkVBox" id="vbox6">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label8">
+                  <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Minimum size of windows to trigger smart placement:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">placement_ratio_scale</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkAlignment" id="alignment4">
+                  <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
                     <property name="bottom_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkLabel" id="label9">
+                          <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes" context="yes">Size|<i>Small</i></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHScale" id="placement_ratio_scale">
+                          <object class="GtkHScale" id="placement_ratio_scale">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">75 0 100 1 10 0</property>
+                            <property name="adjustment">adjustment1</property>
                             <property name="restrict_to_fill_level">False</property>
                             <property name="draw_value">False</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label10">
+                          <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes" context="yes">Size|<i>Large</i></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -522,237 +574,249 @@ when switching via keyboard shortcuts</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="default_placement_box">
+                  <object class="GtkVBox" id="default_placement_box">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <widget class="GtkLabel" id="label27">
+                      <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="yes">By default, place windows:</property>
-                      </widget>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment10">
+                      <object class="GtkAlignment" id="alignment10">
                         <property name="visible">True</property>
                         <property name="bottom_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox18">
+                          <object class="GtkVBox" id="vbox18">
                             <property name="visible">True</property>
                             <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkRadioButton" id="placement_center_option">
+                              <object class="GtkRadioButton" id="placement_center_option">
+                                <property name="label" translatable="yes" context="yes">At the _center of the screen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">At the _center of the screen</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="placement_mouse_option">
+                              <object class="GtkRadioButton" id="placement_mouse_option">
+                                <property name="label" translatable="yes" context="yes">Under the mouse _pointer</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes" context="yes">Under the mouse _pointer</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">1</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">placement_center_option</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">4</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label5">
+            <child type="tab">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes" context="yes">_Placement</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">4</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox7">
+              <object class="GtkVBox" id="vbox7">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkCheckButton" id="use_compositing_check">
+                  <object class="GtkCheckButton" id="use_compositing_check">
+                    <property name="label" translatable="yes" context="yes">_Enable display compositing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes" context="yes">_Enable display compositing</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkScrolledWindow" id="use_compositing_box">
+                  <object class="GtkScrolledWindow" id="use_compositing_box">
                     <property name="visible">True</property>
                     <property name="sensitive">False</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="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <widget class="GtkViewport" id="viewport1">
+                      <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
-                        <property name="resize_mode">GTK_RESIZE_QUEUE</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="resize_mode">queue</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment3">
+                          <object class="GtkAlignment" id="alignment3">
                             <property name="visible">True</property>
                             <property name="bottom_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkVBox" id="vbox8">
+                              <object class="GtkVBox" id="vbox8">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkCheckButton" id="unredirect_overlays_check">
+                                  <object class="GtkCheckButton" id="unredirect_overlays_check">
+                                    <property name="label" translatable="yes" context="yes">Display _fullscreen overlay windows directly</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes" context="yes">Display _fullscreen overlay windows directly</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="show_frame_shadow_check">
+                                  <object class="GtkCheckButton" id="show_frame_shadow_check">
+                                    <property name="label" translatable="yes" context="yes">Show shadows under _regular windows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes" context="yes">Show shadows under _regular windows</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="show_popup_shadow_check">
+                                  <object class="GtkCheckButton" id="show_popup_shadow_check">
+                                    <property name="label" translatable="yes" context="yes">Show shadows under pop_up windows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes" context="yes">Show shadows under pop_up windows</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="show_dock_shadow_check">
+                                  <object class="GtkCheckButton" id="show_dock_shadow_check">
+                                    <property name="label" translatable="yes" context="yes">Show shadows under _dock windows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes" context="yes">Show shadows under _dock windows</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label12">
+                                  <object class="GtkLabel" id="label12">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Opaci_ty of window decorations:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">frame_opacity_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">4</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment5">
+                                  <object class="GtkAlignment" id="alignment5">
                                     <property name="visible">True</property>
                                     <property name="top_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox3">
+                                      <object class="GtkHBox" id="hbox3">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label17">
+                                          <object class="GtkLabel" id="label17">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="frame_opacity_scale">
+                                          <object class="GtkHScale" id="frame_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">90 0 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment2</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label18">
+                                          <object class="GtkLabel" id="label18">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -760,13 +824,13 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label13">
+                                  <object class="GtkLabel" id="label13">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Opacity of _inactive windows:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">inactive_opacity_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -774,52 +838,53 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment6">
+                                  <object class="GtkAlignment" id="alignment6">
                                     <property name="visible">True</property>
                                     <property name="top_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox4">
+                                      <object class="GtkHBox" id="hbox4">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label19">
+                                          <object class="GtkLabel" id="label19">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="inactive_opacity_scale">
+                                          <object class="GtkHScale" id="inactive_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">90 0 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment3</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label20">
+                                          <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -827,13 +892,13 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label14">
+                                  <object class="GtkLabel" id="label14">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Opacity of windows during _move:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">move_opacity_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -841,52 +906,53 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment7">
+                                  <object class="GtkAlignment" id="alignment7">
                                     <property name="visible">True</property>
                                     <property name="top_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox5">
+                                      <object class="GtkHBox" id="hbox5">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label21">
+                                          <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="move_opacity_scale">
+                                          <object class="GtkHScale" id="move_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">90 0 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment4</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label22">
+                                          <object class="GtkLabel" id="label22">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -894,13 +960,13 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label15">
+                                  <object class="GtkLabel" id="label15">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Opacity of windows during resi_ze:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">resize_opacity_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -908,52 +974,53 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment8">
+                                  <object class="GtkAlignment" id="alignment8">
                                     <property name="visible">True</property>
                                     <property name="top_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox6">
+                                      <object class="GtkHBox" id="hbox6">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label23">
+                                          <object class="GtkLabel" id="label23">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="resize_opacity_scale">
+                                          <object class="GtkHScale" id="resize_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">90 0 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment5</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label24">
+                                          <object class="GtkLabel" id="label24">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -961,13 +1028,13 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label16">
+                                  <object class="GtkLabel" id="label16">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="yes">Opacity of popup window_s:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">popup_opacity_scale</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -975,125 +1042,136 @@ when switching via keyboard shortcuts</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkAlignment" id="alignment9">
+                                  <object class="GtkAlignment" id="alignment9">
                                     <property name="visible">True</property>
                                     <property name="top_padding">2</property>
                                     <property name="left_padding">12</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox7">
+                                      <object class="GtkHBox" id="hbox7">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label25">
+                                          <object class="GtkLabel" id="label25">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Transparent</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkHScale" id="popup_opacity_scale">
+                                          <object class="GtkHScale" id="popup_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">90 0 100 1 10 0</property>
+                                            <property name="update_policy">discontinuous</property>
+                                            <property name="adjustment">adjustment6</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label26">
+                                          <object class="GtkLabel" id="label26">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes" context="yes"><i>Opaque</i></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">13</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">5</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label6">
+            <child type="tab">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes" context="yes">C_ompositor</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
-                <property name="type">tab</property>
                 <property name="position">5</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
+                <property name="label" context="yes">gtk-help</property>
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" context="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="button1">
+                <property name="label" context="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" context="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="0">button2</action-widget>
+      <action-widget response="0">button1</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/settings-dialogs/xfwm4-workspace-dialog.glade b/settings-dialogs/xfwm4-workspace-dialog.glade
index 513275e..904cfcb 100644
--- a/settings-dialogs/xfwm4-workspace-dialog.glade
+++ b/settings-dialogs/xfwm4-workspace-dialog.glade
@@ -1,142 +1,172 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Oct 31 11:02:28 2008 -->
-<glade-interface>
-  <requires lib="xfce4"/>
-  <widget class="XfceTitledDialog" id="main-dialog">
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires libxfce4ui 4.5 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment5">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Workspaces</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="default_width">400</property>
     <property name="default_height">400</property>
     <property name="icon_name">xfce4-workspaces</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Set number and names of workspaces</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="main-vbox">
+      <object class="GtkVBox" id="main-vbox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkHBox" id="plug-child">
+          <object class="GtkHBox" id="plug-child">
             <property name="visible">True</property>
             <property name="homogeneous">True</property>
             <child>
-              <widget class="GtkFrame" id="frame1">
+              <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="workspaces">
+                      <object class="GtkVBox" id="workspaces">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox3">
+                          <object class="GtkHBox" id="hbox3">
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
                             <child>
-                              <widget class="GtkLabel" id="label3">
+                              <object class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">_Number of workspaces:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">workspace_count_spinbutton</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkSpinButton" id="workspace_count_spinbutton">
+                              <object class="GtkSpinButton" id="workspace_count_spinbutton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
-                                <property name="adjustment">0 0 100 1 10 0</property>
-                              </widget>
+                                <property name="adjustment">adjustment1</property>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <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_ETCHED_IN</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
                             <child>
-                              <widget class="GtkTreeView" id="treeview_ws_names">
+                              <object class="GtkTreeView" id="treeview_ws_names">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="headers_clickable">True</property>
                                 <property name="rules_hint">True</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label1">
+                <child type="label">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Workspaces</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame2">
+              <object class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment2">
+                  <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="margins">
+                      <object class="GtkVBox" id="margins">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label5">
+                          <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Margins are areas on the edges of the screen where no window will be placed</property>
                             <property name="wrap">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkFrame" id="frame3">
+                          <object class="GtkFrame" id="frame3">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
                             <property name="label_yalign">0</property>
                             <child>
-                              <widget class="GtkAlignment" id="alignment3">
+                              <object class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
@@ -145,28 +175,16 @@
                                 <property name="left_padding">6</property>
                                 <property name="right_padding">6</property>
                                 <child>
-                                  <widget class="GtkTable" id="table1">
+                                  <object class="GtkTable" id="table1">
                                     <property name="visible">True</property>
                                     <property name="n_rows">3</property>
                                     <property name="n_columns">3</property>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkSpinButton" id="margin_left_spinbutton">
+                                      <object class="GtkSpinButton" id="margin_left_spinbutton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">0 0 100 1 10 0</property>
-                                      </widget>
+                                        <property name="adjustment">adjustment2</property>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
@@ -175,11 +193,11 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkSpinButton" id="margin_bottom_spinbutton">
+                                      <object class="GtkSpinButton" id="margin_bottom_spinbutton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">0 0 100 1 10 0</property>
-                                      </widget>
+                                        <property name="adjustment">adjustment3</property>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
@@ -190,11 +208,11 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkSpinButton" id="margin_right_spinbutton">
+                                      <object class="GtkSpinButton" id="margin_right_spinbutton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">0 0 100 1 10 0</property>
-                                      </widget>
+                                        <property name="adjustment">adjustment4</property>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">2</property>
                                         <property name="right_attach">3</property>
@@ -205,12 +223,12 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkImage" id="monitor_icon">
+                                      <object class="GtkImage" id="monitor_icon">
                                         <property name="visible">True</property>
                                         <property name="xpad">6</property>
                                         <property name="ypad">6</property>
                                         <property name="stock">gtk-missing-image</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
@@ -219,11 +237,11 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkSpinButton" id="margin_top_spinbutton">
+                                      <object class="GtkSpinButton" id="margin_top_spinbutton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">0 0 100 1 10 0</property>
-                                      </widget>
+                                        <property name="adjustment">adjustment5</property>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
@@ -231,124 +249,143 @@
                                         <property name="y_options"></property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                            <child>
+                            <child type="label_item">
                               <placeholder/>
-                              <packing>
-                                <property name="type">label_item</property>
-                              </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label4">
+                <child type="label">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Margins</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="padding">6</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
-              </widget>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="XfceTitledDialog" id="change_name_dialog">
+    <action-widgets>
+      <action-widget response="0">button2</action-widget>
+      <action-widget response="0">button1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="XfceTitledDialog" id="change_name_dialog">
     <property name="title" translatable="yes">Change workspace name</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">xfce4-workspaces</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="transient_for">main-dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkHBox" id="hbox1">
+          <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
             <property name="border_width">6</property>
             <property name="spacing">12</property>
             <child>
-              <widget class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_name</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="entry_name">
+              <object class="GtkEntry" id="entry_name">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="activates_default">True</property>
                 <property name="width_chars">16</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -356,41 +393,51 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="button3">
+              <object class="GtkButton" id="button3">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button4">
+              <object class="GtkButton" id="button4">
+                <property name="label">gtk-save</property>
                 <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="receives_default">True</property>
-                <property name="label">gtk-save</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-3</property>
-              </widget>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="0">button3</action-widget>
+      <action-widget response="0">button4</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/src/Makefile.am b/src/Makefile.am
index adb715d..cc3cb36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,7 @@ xfwm4_CFLAGS =								\
 	$(LIBX11_CFLAGS)						\
 	$(LIBXFCONF_CFLAGS)						\
 	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(LIBXFCEGUI4_CFLAGS)						\
+	$(LIBXFCE4UI_CFLAGS)						\
 	$(LIBXFCE4KBD_PRIVATE_CFLAGS)					\
 	$(RENDER_CFLAGS)						\
 	$(LIBSTARTUP_NOTIFICATION_CFLAGS)				\
@@ -102,7 +102,7 @@ xfwm4_LDADD =								\
 	$(LIBX11_LDFLAGS)						\
 	$(LIBXFCONF_LIBS)						\
 	$(LIBXFCE4UTIL_LIBS)						\
-	$(LIBXFCEGUI4_LIBS)						\
+	$(LIBXFCE4UI_LIBS)						\
 	$(LIBXFCE4KBD_PRIVATE_LIBS)					\
 	$(LIBSTARTUP_NOTIFICATION_LIBS)					\
 	$(RENDER_LIBS)							\
diff --git a/src/display.h b/src/display.h
index 12ada09..f305274 100644
--- a/src/display.h
+++ b/src/display.h
@@ -63,7 +63,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "event_filter.h"
 
@@ -290,7 +290,7 @@ struct _DisplayInfo
     GdkDisplay *gdisplay;
     Display *dpy;
 
-    SessionClient *session;
+    XfceSMClient *session;
     gboolean quit;
     gboolean reload;
 
diff --git a/src/events.c b/src/events.c
index 6696d76..07658e4 100644
--- a/src/events.c
+++ b/src/events.c
@@ -41,6 +41,7 @@
 #include <X11/extensions/Xrandr.h>
 #endif
 #include <libxfce4util/libxfce4util.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "misc.h"
 #include "workspaces.h"
@@ -418,7 +419,7 @@ handleKeyPress (DisplayInfo *display_info, XKeyEvent * ev)
                 status = EVENT_FILTER_REMOVE;
                 if (display_info->session)
                 {
-                    logout_session (display_info->session);
+                    xfce_sm_client_request_shutdown(display_info->session, XFCE_SM_CLIENT_SHUTDOWN_HINT_LOGOUT);
                 }
                 break;
             default:
@@ -2308,7 +2309,7 @@ handleEvent (DisplayInfo *display_info, XEvent * ev)
              * Qutting on purpose, update session manager so
              * it does not restart the program immediately
              */
-            client_session_set_restart_style(display_info->session, SESSION_RESTART_IF_RUNNING);
+            xfce_sm_client_set_restart_style(display_info->session, XFCE_SM_CLIENT_RESTART_NORMAL);
             gtk_main_quit ();
         }
     }
diff --git a/src/icons.c b/src/icons.c
index 766eb5c..3b7fcbf 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -32,7 +32,6 @@
 #include <gdk/gdkx.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
 
 #include "inline-default-icon.h"
 #include "icons.h"
@@ -522,5 +521,5 @@ getAppIcon (DisplayInfo *display_info, Window window, int width, int height)
         }
     }
 
-    return xfce_inline_icon_at_size (default_icon_data, width, height);
+    return NULL; /*xfce_inline_icon_at_size (default_icon_data, width, height);*/
 }
diff --git a/src/main.c b/src/main.c
index fee8357..15f0947 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,7 +32,6 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/session.c b/src/session.c
index 22a7922..41a2719 100644
--- a/src/session.c
+++ b/src/session.c
@@ -40,7 +40,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "display.h"
 #include "screen.h"
@@ -706,7 +706,7 @@ sessionMatchWinToSM (Client * c)
 }
 
 static char *
-sessionBuildFilename(SessionClient *client_session)
+sessionBuildFilename(XfceSMClient *client_session)
 {
     gchar *filename, *path, *file;
     GError *error;
@@ -722,7 +722,7 @@ sessionBuildFilename(SessionClient *client_session)
         return NULL;
     }
 
-    file = g_strdup_printf("xfwm4-%s", client_session->given_client_id);
+    file = g_strdup_printf("xfwm4-%s", xfce_sm_client_get_client_id(client_session));
     filename = g_build_filename (path, file, NULL);
     g_free (file);
     g_free (path);
@@ -733,7 +733,7 @@ sessionBuildFilename(SessionClient *client_session)
 static void
 sessionLoad (DisplayInfo *display_info)
 {
-    SessionClient *session;
+    XfceSMClient *session;
     gchar *filename;
 
     session = display_info->session;
@@ -745,11 +745,12 @@ sessionLoad (DisplayInfo *display_info)
     }
 }
 
+/*
 static void
 sessionSavePhase2 (gpointer data)
 {
     DisplayInfo *display_info;
-    SessionClient *session;
+    XfceSMClient *session;
     gchar *filename;
 
     display_info = (DisplayInfo *) data;
@@ -768,24 +769,27 @@ sessionDie (gpointer data)
     DisplayInfo *display_info;
 
     display_info = (DisplayInfo *) data;
-    client_session_set_restart_style(display_info->session, SESSION_RESTART_IF_RUNNING);
+    xfce_sm_client_set_restart_style(display_info->session, XFCE_SM_CLIENT_RESTART_NORMAL);
     display_info->quit = TRUE;
     gtk_main_quit ();
 }
+*/
 
 int
 sessionStart (int argc, char **argv, DisplayInfo *display_info)
 {
-    SessionClient *session;
+    XfceSMClient *session;
 
-    display_info->session = client_session_new (argc, argv, (gpointer) display_info,
-                                                SESSION_RESTART_IMMEDIATELY, 20);
+    display_info->session = xfce_sm_client_get_with_argv (argc, argv,
+                                                XFCE_SM_CLIENT_RESTART_IMMEDIATELY, 20);
     session = display_info->session;
+    /*
     session->data = (gpointer) display_info;
     session->save_phase_2 = sessionSavePhase2;
     session->die = sessionDie;
+    */
 
-    if (session_init (session))
+    if (xfce_sm_client_connect(session, NULL))
     {
         sessionLoad (display_info);
         return 1;



More information about the Xfce4-commits mailing list