diff --git a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade
index a9b41d7..7cc6ca3 100644
--- a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade
+++ b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade
@@ -1,29 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="execute_dialog">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">30</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">4</property>
+  </object>
+  <object class="GtkDialog" id="execute_dialog">
     <property name="title" translatable="yes">Select Program</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="default_width">400</property>
     <property name="default_height">300</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkVBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkFrame" id="frame1">
+          <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <property name="label_yalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="treeview_frame">
+                  <object class="GtkScrolledWindow" id="treeview_frame">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">5</property>
@@ -31,94 +38,89 @@
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="programs_treeview">
+                      <object class="GtkTreeView" id="programs_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox27">
+                  <object class="GtkHBox" id="hbox27">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label3">
+                      <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Arguments:</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="program_arguments">
+                      <object class="GtkEntry" id="program_arguments">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="activates_default">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="padding">5</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="program_run_in_terminal">
+                  <object class="GtkCheckButton" id="program_run_in_terminal">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">5</property>
                     <property name="label" translatable="yes">Run in terminal</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">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label105">
+            <child type="label">
+              <object class="GtkLabel" id="label105">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Select Program to run:&lt;/b&gt;</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>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkHButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancelbutton2">
+              <object class="GtkButton" id="cancelbutton2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton3">
+              <object class="GtkButton" id="okbutton3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -126,91 +128,93 @@
                 <property name="has_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="preferences_dialog_build">
+    <action-widgets>
+      <action-widget response="0">program_run_in_terminal</action-widget>
+      <action-widget response="-6">cancelbutton2</action-widget>
+      <action-widget response="-5">okbutton3</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="preferences_dialog_build">
     <property name="title" translatable="yes">window1</property>
     <child>
-      <widget class="GtkVBox" id="preferences_build_container">
+      <object class="GtkVBox" id="preferences_build_container">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
-          <widget class="GtkFrame" id="frame3">
+          <object class="GtkFrame" id="frame3">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment1">
+              <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</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="spacing">6</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.parallel.make">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.parallel.make">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Run several commands at a time:</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>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="preferences_spin:int:1:0:build.parallel.make.job">
+                          <object class="GtkSpinButton" id="preferences_spin:int:1:0:build.parallel.make.job">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="xalign">1</property>
-                            <property name="adjustment">4 1 30 1 10 0</property>
+                            <property name="adjustment">adjustment1</property>
                             <property name="snap_to_ticks">True</property>
                             <property name="numeric">True</property>
                             <property name="wrap">True</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>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.continue.error">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.continue.error">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Continue on errors</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>
@@ -218,132 +222,123 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:build.translate.message">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:build.translate.message">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Translate messages</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:indicators.automatic">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:indicators.automatic">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Highlight message locations in editor</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>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label5">
+            <child type="label">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Build&lt;/b&gt;</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>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame2">
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment4">
+              <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox5">
+                  <object class="GtkVBox" id="vbox5">
                     <property name="visible">True</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">6</property>
                         <child>
-                          <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.install.root">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.install.root">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Install as root:</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>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="preferences_entry:text:sudo:0:build.install.root.command">
+                          <object class="GtkEntry" id="preferences_entry:text:sudo:0:build.install.root.command">
                             <property name="visible">True</property>
                             <property name="can_focus">True</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>
                       </packing>
                     </child>
-                  </widget>
+                  </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="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Install&lt;/b&gt;</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">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="configure_dialog">
+  </object>
+  <object class="GtkDialog" id="configure_dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Configure Project</property>
@@ -352,197 +347,198 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_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="GtkVBox" id="vbox4">
+          <object class="GtkVBox" id="vbox4">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">18</property>
             <child>
-              <widget class="GtkCheckButton" id="force_autogen_check">
+              <object class="GtkCheckButton" id="force_autogen_check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label4">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Regenerate project&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox6">
+              <object class="GtkVBox" id="vbox6">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox1">
+                  <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="spacing">12</property>
                     <child>
-                      <widget class="GtkLabel" id="label1">
+                      <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;b&gt;Configuration:&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBoxEntry" id="configuration_combo_entry">
+                      <object class="GtkComboBoxEntry" id="configuration_combo_entry">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child internal-child="entry">
-                          <widget class="GtkEntry" id="comboboxentry-entry2">
+                          <object class="GtkEntry" id="comboboxentry-entry2">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </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>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkAlignment" id="alignment2">
+                  <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkTable" id="table1">
+                      <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkEntry" id="configure_args_entry">
+                          <object class="GtkEntry" id="configure_args_entry">
                             <property name="visible">True</property>
                             <property name="app_paintable">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label6">
+                          <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Configure Options:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkFileChooserButton" id="build_dir_chooser">
+                          <object class="GtkFileChooserButton" id="build_dir_chooser">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                             <property name="title" translatable="yes">Select a build directory</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label2">
+                          <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Build Directory:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </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="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="ok_button">
+              <object class="GtkButton" id="ok_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-execute</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">button2</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/build-basic-autotools/build-options.c b/plugins/build-basic-autotools/build-options.c
index 98cd8e0..60838c9 100644
--- a/plugins/build-basic-autotools/build-options.c
+++ b/plugins/build-basic-autotools/build-options.c
@@ -22,7 +22,6 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <glade/glade-xml.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-shell.h>
 #include <string.h>
@@ -30,7 +29,7 @@
 /* Constants
  *---------------------------------------------------------------------------*/
 
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-build-basic-autotools-plugin.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-build-basic-autotools-plugin.glade"
 
 #define CONFIGURE_DIALOG "configure_dialog"
 #define RUN_AUTOGEN_CHECK "force_autogen_check"
@@ -306,20 +305,26 @@ fill_dialog (BuildConfigureDialog *dlg)
 gboolean
 build_dialog_configure (GtkWindow* parent, const gchar *project_root_uri, BuildConfigurationList *config_list, gboolean *run_autogen)
 {
-	GladeXML* gxml;
+	GError* error = NULL;
+	GtkBuilder* bxml;
 	BuildConfigureDialog dlg;
 	BuildConfiguration *cfg = NULL;
 	gint response;
 	
 	/* Get all dialog widgets */
-	gxml = glade_xml_new (GLADE_FILE, CONFIGURE_DIALOG, NULL);
-	dlg.win = glade_xml_get_widget (gxml, CONFIGURE_DIALOG);
-	dlg.combo = glade_xml_get_widget(gxml, CONFIGURATION_COMBO);
-	dlg.autogen = glade_xml_get_widget(gxml, RUN_AUTOGEN_CHECK);
-	dlg.build_dir_chooser = glade_xml_get_widget(gxml, BUILD_DIR_CHOOSER);
-	dlg.args = glade_xml_get_widget(gxml, CONFIGURE_ARGS_ENTRY);
-	dlg.ok = glade_xml_get_widget(gxml, OK_BUTTON);
-	g_object_unref (gxml);
+	bxml = gtk_builder_new();
+	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+	dlg.win = GTK_WIDGET (gtk_builder_get_object (bxml, CONFIGURE_DIALOG));
+	dlg.combo = GTK_WIDGET (gtk_builder_get_object (bxml, CONFIGURATION_COMBO));
+	dlg.autogen = GTK_WIDGET (gtk_builder_get_object (bxml, RUN_AUTOGEN_CHECK));
+	dlg.build_dir_chooser = GTK_WIDGET (gtk_builder_get_object (bxml, BUILD_DIR_CHOOSER));
+	dlg.args = GTK_WIDGET (gtk_builder_get_object (bxml, CONFIGURE_ARGS_ENTRY));
+	dlg.ok = GTK_WIDGET (gtk_builder_get_object (bxml, OK_BUTTON));
+	g_object_unref (bxml);
 	
 	dlg.config_list = config_list;
 	dlg.project_uri = project_root_uri;
diff --git a/plugins/build-basic-autotools/executer.c b/plugins/build-basic-autotools/executer.c
index cdc4a2a..3eeb51a 100644
--- a/plugins/build-basic-autotools/executer.c
+++ b/plugins/build-basic-autotools/executer.c
@@ -24,8 +24,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <glade/glade.h>
-
 #include <libanjuta/resources.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-utils.h>
@@ -46,7 +44,8 @@ get_program_parameters (BasicAutotoolsPlugin *plugin,
 						gchar **program_args,
 						gboolean *run_in_terminal)
 {
-	GladeXML *gxml;
+	GError* error = NULL;
+	GtkBuilder *bxml;
 	GtkWidget *dlg, *treeview, *use_terminal_check, *arguments_entry;
 	GtkWidget *treeview_frame;
 	GtkTreeViewColumn *column;
@@ -79,13 +78,18 @@ get_program_parameters (BasicAutotoolsPlugin *plugin,
 	{
 		exec_targets = NULL;
 	}
-		
-	gxml = glade_xml_new (GLADE_FILE, "execute_dialog", NULL);
-	dlg = glade_xml_get_widget (gxml, "execute_dialog");
-	treeview = glade_xml_get_widget (gxml, "programs_treeview");
-	treeview_frame = glade_xml_get_widget (gxml, "treeview_frame");
-	use_terminal_check = glade_xml_get_widget (gxml, "program_run_in_terminal");
-	arguments_entry = glade_xml_get_widget (gxml, "program_arguments");
+
+	bxml = gtk_builder_new();
+	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}		
+	dlg = GTK_WIDGET (gtk_builder_get_object (bxml, "execute_dialog"));
+	treeview = GTK_WIDGET (gtk_builder_get_object (bxml, "programs_treeview"));
+	treeview_frame = GTK_WIDGET (gtk_builder_get_object (bxml, "treeview_frame"));
+	use_terminal_check = GTK_WIDGET (gtk_builder_get_object (bxml, "program_run_in_terminal"));
+	arguments_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "program_arguments"));
 	
 	gtk_window_set_transient_for (GTK_WINDOW (dlg),
 								  GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell));
@@ -210,7 +214,7 @@ get_program_parameters (BasicAutotoolsPlugin *plugin,
 		}
 	}
 	gtk_widget_destroy (dlg);
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 	return success;
 }
 
diff --git a/plugins/build-basic-autotools/plugin.c b/plugins/build-basic-autotools/plugin.c
index 992bd8f..f21c471 100644
--- a/plugins/build-basic-autotools/plugin.c
+++ b/plugins/build-basic-autotools/plugin.c
@@ -3343,26 +3343,35 @@ ibuilder_iface_init (IAnjutaBuilderIface *iface)
 /* IAnjutaPreferences implementation
  *---------------------------------------------------------------------------*/
 
-static GladeXML *gxml;
+static GtkBuilder *bxml;
 
 static void
 ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
 {
+	GError* error = NULL;
 	GtkWidget *root_check;
 	GtkWidget *entry;
 		
 	/* Create the preferences page */
-	gxml = glade_xml_new (GLADE_FILE, BUILD_PREFS_DIALOG, NULL);
-	root_check = glade_xml_get_widget(gxml, INSTALL_ROOT_CHECK);
-	entry = glade_xml_get_widget(gxml, INSTALL_ROOT_ENTRY);
+	bxml =  gtk_builder_new();
+
+	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	root_check = GTK_WIDGET (gtk_builder_get_object (bxml, INSTALL_ROOT_CHECK));
+	entry = GTK_WIDGET (gtk_builder_get_object (bxml, INSTALL_ROOT_ENTRY));
 	g_signal_connect(G_OBJECT(root_check), "toggled", G_CALLBACK(on_root_check_toggled), entry);
 	on_root_check_toggled (root_check, entry);
-	root_check = glade_xml_get_widget(gxml, PARALLEL_MAKE_CHECK);
-	entry = glade_xml_get_widget(gxml, PARALLEL_MAKE_SPIN);
+
+	root_check = GTK_WIDGET (gtk_builder_get_object (bxml, PARALLEL_MAKE_CHECK));
+	entry = GTK_WIDGET (gtk_builder_get_object (bxml, PARALLEL_MAKE_SPIN));
 	g_signal_connect(G_OBJECT(root_check), "toggled", G_CALLBACK(on_root_check_toggled), entry);
 	on_root_check_toggled (root_check, entry);
 	
-	anjuta_preferences_add_page (prefs, gxml, BUILD_PREFS_ROOT, _("Build Autotools"),  ICON_FILE);
+	anjuta_preferences_add_from_builder (prefs, bxml, BUILD_PREFS_ROOT, _("Build Autotools"),  ICON_FILE);
 }
 
 static void
@@ -3371,18 +3380,19 @@ ipreferences_unmerge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError
 	GtkWidget *root_check;
 	GtkWidget *entry;
 
-	root_check = glade_xml_get_widget(gxml, INSTALL_ROOT_CHECK);
-	entry = glade_xml_get_widget(gxml, INSTALL_ROOT_ENTRY);
+	root_check = GTK_WIDGET (gtk_builder_get_object (bxml, INSTALL_ROOT_CHECK));
+	entry = GTK_WIDGET (gtk_builder_get_object (bxml, INSTALL_ROOT_ENTRY));
 	g_signal_handlers_disconnect_by_func(G_OBJECT(root_check),
 		G_CALLBACK(on_root_check_toggled), entry);
-	root_check = glade_xml_get_widget(gxml, PARALLEL_MAKE_CHECK);
-	entry = glade_xml_get_widget(gxml, PARALLEL_MAKE_SPIN);
+
+	root_check = GTK_WIDGET (gtk_builder_get_object (bxml, PARALLEL_MAKE_CHECK));
+	entry = GTK_WIDGET (gtk_builder_get_object (bxml, PARALLEL_MAKE_SPIN));
 	g_signal_handlers_disconnect_by_func(G_OBJECT(root_check),
 		G_CALLBACK(on_root_check_toggled), entry);
 		
 	anjuta_preferences_remove_page(prefs, _("Build Autotools"));
 	
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 }
 
 static void
diff --git a/plugins/build-basic-autotools/plugin.h b/plugins/build-basic-autotools/plugin.h
index e391306..d422791 100644
--- a/plugins/build-basic-autotools/plugin.h
+++ b/plugins/build-basic-autotools/plugin.h
@@ -26,7 +26,7 @@
 
 #include "configuration-list.h"
 
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-build-basic-autotools-plugin.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-build-basic-autotools-plugin.glade"
 
 extern GType basic_autotools_plugin_get_type (GTypeModule *module);
 #define ANJUTA_TYPE_PLUGIN_BASIC_AUTOTOOLS         (basic_autotools_plugin_get_type (NULL))
diff --git a/plugins/class-gen/Makefile.am b/plugins/class-gen/Makefile.am
index 3224c39..e094bdb 100644
--- a/plugins/class-gen/Makefile.am
+++ b/plugins/class-gen/Makefile.am
@@ -32,7 +32,6 @@ libanjuta_class_gen_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_class_gen_la_LIBADD = \
 	${top_builddir}/plugins/project-wizard/libanjuta-project-wizard.la \
-	$(GLADE_LIBS) \
 	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS)
 
diff --git a/plugins/class-gen/anjuta-class-gen-plugin.glade b/plugins/class-gen/anjuta-class-gen-plugin.glade
index 4b60767..184792e 100644
--- a/plugins/class-gen/anjuta-class-gen-plugin.glade
+++ b/plugins/class-gen/anjuta-class-gen-plugin.glade
@@ -1,45 +1,76 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--Generated with glade3 3.4.0 on Sun Feb  3 22:47:36 2008 
 	Version: 3.0.1
 	Date: Sun Oct 22 11:16:36 2006
 	User: ck
 	Host: unununium
 -->
-<glade-interface>
-  <widget class="GtkDialog" id="classgen_main">
+<interface>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">public</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">protected</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">private</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">General Public License (GPL)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Lesser General Public License (LGPL)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">No License</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkDialog" id="classgen_main">
     <property name="title">Class Generator</property>
     <property name="default_height">582</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="border_width">8</property>
             <property name="spacing">4</property>
             <child>
-              <widget class="GtkNotebook" id="top_notebook">
+              <object class="GtkNotebook" id="top_notebook">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox8">
+                  <object class="GtkVBox" id="vbox8">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="spacing">6</property>
                     <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>
                         <child>
-                          <widget class="GtkAlignment" id="alignment7">
+                          <object class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkTable" id="table7">
+                              <object class="GtkTable" id="table7">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
@@ -52,23 +83,23 @@
                                   <placeholder/>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label38">
+                                  <object class="GtkLabel" id="label38">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Class Name:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">cc_name</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="cc_name">
+                                  <object class="GtkEntry" id="cc_name">
                                     <property name="visible">True</property>
                                     <property name="activates_default">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
@@ -76,22 +107,22 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label39">
+                                  <object class="GtkLabel" id="label39">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Base Class:</property>
                                     <property name="mnemonic_widget">cc_base</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="cc_base">
+                                  <object class="GtkEntry" id="cc_base">
                                     <property name="visible">True</property>
                                     <property name="activates_default">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
@@ -99,11 +130,11 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label40">
+                                  <object class="GtkLabel" id="label40">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Base Class Inheritance:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
@@ -112,12 +143,16 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cc_inheritance">
+                                  <object class="GtkComboBox" id="cc_inheritance">
                                     <property name="visible">True</property>
-                                    <property name="items">public
-protected
-private</property>
-                                  </widget>
+                                    <property name="model">model1</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer1"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
@@ -127,11 +162,11 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label45">
+                                  <object class="GtkLabel" id="label45">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Class Options:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
@@ -140,11 +175,11 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label46">
+                                  <object class="GtkLabel" id="label46">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Source/Header Headings:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
@@ -153,12 +188,11 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="cc_inline">
+                                  <object class="GtkCheckButton" id="cc_inline">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Inline the declaration and implementation</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">4</property>
@@ -168,13 +202,12 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="cc_headings">
+                                  <object class="GtkCheckButton" id="cc_headings">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Author/Date/Time</property>
-                                    <property name="response_id">0</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">4</property>
@@ -183,41 +216,38 @@ private</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label47">
+                        <child type="label">
+                          <object class="GtkLabel" id="label47">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;General Class Properties&lt;/b&gt;</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>
                       </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>
                         <child>
-                          <widget class="GtkAlignment" id="alignment8">
+                          <object class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkVBox" id="vbox9">
+                              <object class="GtkVBox" id="vbox9">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow4">
+                                  <object class="GtkScrolledWindow" id="scrolledwindow4">
                                     <property name="height_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -225,90 +255,84 @@ private</property>
                                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                     <property name="shadow_type">GTK_SHADOW_IN</property>
                                     <child>
-                                      <widget class="GtkTreeView" id="cc_elements">
+                                      <object class="GtkTreeView" id="cc_elements">
                                         <property name="visible">True</property>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
                                 <child>
-                                  <widget class="GtkHButtonBox" id="hbuttonbox4">
+                                  <object class="GtkHButtonBox" id="hbuttonbox4">
                                     <property name="visible">True</property>
                                     <property name="spacing">6</property>
                                     <property name="layout_style">GTK_BUTTONBOX_END</property>
                                     <child>
-                                      <widget class="GtkButton" id="cc_elements_remove">
+                                      <object class="GtkButton" id="cc_elements_remove">
                                         <property name="visible">True</property>
                                         <property name="label">gtk-remove</property>
                                         <property name="use_stock">True</property>
-                                        <property name="response_id">0</property>
-                                      </widget>
+                                      </object>
                                     </child>
                                     <child>
-                                      <widget class="GtkButton" id="cc_elements_add">
+                                      <object class="GtkButton" id="cc_elements_add">
                                         <property name="visible">True</property>
                                         <property name="label">gtk-add</property>
                                         <property name="use_stock">True</property>
-                                        <property name="response_id">0</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <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="label48">
+                        <child type="label">
+                          <object class="GtkLabel" id="label48">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Class Elements&lt;/b&gt;</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>
                 </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">Generic C++ Class</property>
-                  </widget>
+                  </object>
                   <packing>
-                    <property name="type">tab</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">6</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>
                         <child>
-                          <widget class="GtkAlignment" id="alignment5">
+                          <object class="GtkAlignment" id="alignment5">
                             <property name="visible">True</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkTable" id="table3">
+                              <object class="GtkTable" id="table3">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
@@ -321,21 +345,21 @@ private</property>
                                   <placeholder/>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label27">
+                                  <object class="GtkLabel" id="label27">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Class Name:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="go_name">
+                                  <object class="GtkEntry" id="go_name">
                                     <property name="visible">True</property>
                                     <property name="activates_default">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
@@ -343,22 +367,22 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label28">
+                                  <object class="GtkLabel" id="label28">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Base Class:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="go_base">
+                                  <object class="GtkEntry" id="go_base">
                                     <property name="visible">True</property>
                                     <property name="activates_default">True</property>
                                     <property name="text">GObject</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
@@ -366,11 +390,11 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label29">
+                                  <object class="GtkLabel" id="label29">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">GObject Prefix and Type:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
@@ -379,11 +403,11 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label35">
+                                  <object class="GtkLabel" id="label35">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Source/Header Headings:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
@@ -392,13 +416,12 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkCheckButton" id="go_headings">
+                                  <object class="GtkCheckButton" id="go_headings">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Author/Date-Time</property>
-                                    <property name="response_id">0</property>
                                     <property name="active">True</property>
                                     <property name="draw_indicator">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">4</property>
@@ -408,38 +431,38 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox4">
+                                  <object class="GtkHBox" id="hbox4">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkEntry" id="go_prefix">
+                                      <object class="GtkEntry" id="go_prefix">
                                         <property name="visible">True</property>
                                         <property name="activates_default">True</property>
                                         <property name="width_chars">6</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label49">
+                                      <object class="GtkLabel" id="label49">
                                         <property name="visible">True</property>
                                         <property name="label">_TYPE_</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkEntry" id="go_type">
+                                      <object class="GtkEntry" id="go_type">
                                         <property name="visible">True</property>
                                         <property name="activates_default">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">4</property>
@@ -448,11 +471,11 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label51">
+                                  <object class="GtkLabel" id="label51">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Class Function Prefix:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
@@ -461,57 +484,54 @@ private</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="go_func_prefix">
+                                  <object class="GtkEntry" id="go_func_prefix">
                                     <property name="visible">True</property>
                                     <property name="activates_default">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label36">
+                        <child type="label">
+                          <object class="GtkLabel" id="label36">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;General Class Properties&lt;/b&gt;</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>
                       </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>
                         <child>
-                          <widget class="GtkAlignment" id="alignment6">
+                          <object class="GtkAlignment" id="alignment6">
                             <property name="visible">True</property>
                             <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <widget class="GtkNotebook" id="notebook2">
+                              <object class="GtkNotebook" id="notebook2">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkVBox" id="vbox10">
+                                  <object class="GtkVBox" id="vbox10">
                                     <property name="visible">True</property>
                                     <property name="border_width">8</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow5">
+                                      <object class="GtkScrolledWindow" id="scrolledwindow5">
                                         <property name="height_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -519,61 +539,58 @@ private</property>
                                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                         <property name="shadow_type">GTK_SHADOW_IN</property>
                                         <child>
-                                          <widget class="GtkTreeView" id="go_members">
+                                          <object class="GtkTreeView" id="go_members">
                                             <property name="visible">True</property>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
                                     <child>
-                                      <widget class="GtkHButtonBox" id="hbuttonbox5">
+                                      <object class="GtkHButtonBox" id="hbuttonbox5">
                                         <property name="visible">True</property>
                                         <property name="spacing">6</property>
                                         <property name="layout_style">GTK_BUTTONBOX_END</property>
                                         <child>
-                                          <widget class="GtkButton" id="go_members_remove">
+                                          <object class="GtkButton" id="go_members_remove">
                                             <property name="visible">True</property>
                                             <property name="label">gtk-remove</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
+                                          </object>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="go_members_add">
+                                          <object class="GtkButton" id="go_members_add">
                                             <property name="visible">True</property>
                                             <property name="label">gtk-add</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <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>
-                                <child>
-                                  <widget class="GtkLabel" id="label52">
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label52">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Member Functions/Variables</property>
-                                  </widget>
+                                  </object>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="tab_fill">False</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkVBox" id="vbox12">
+                                  <object class="GtkVBox" id="vbox12">
                                     <property name="visible">True</property>
                                     <property name="border_width">8</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow7">
+                                      <object class="GtkScrolledWindow" id="scrolledwindow7">
                                         <property name="height_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -581,65 +598,59 @@ private</property>
                                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                         <property name="shadow_type">GTK_SHADOW_IN</property>
                                         <child>
-                                          <widget class="GtkTreeView" id="go_properties">
+                                          <object class="GtkTreeView" id="go_properties">
                                             <property name="visible">True</property>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
                                     <child>
-                                      <widget class="GtkHButtonBox" id="hbuttonbox7">
+                                      <object class="GtkHButtonBox" id="hbuttonbox7">
                                         <property name="visible">True</property>
                                         <property name="spacing">6</property>
                                         <property name="layout_style">GTK_BUTTONBOX_END</property>
                                         <child>
-                                          <widget class="GtkButton" id="go_properties_remove">
+                                          <object class="GtkButton" id="go_properties_remove">
                                             <property name="visible">True</property>
                                             <property name="label">gtk-remove</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
+                                          </object>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="go_properties_add">
+                                          <object class="GtkButton" id="go_properties_add">
                                             <property name="visible">True</property>
                                             <property name="label">gtk-add</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="">
+                                <child type="tab">
+                                  <object class="GtkLabel" id="">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Properties</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="vbox13">
+                                  <object class="GtkVBox" id="vbox13">
                                     <property name="visible">True</property>
                                     <property name="border_width">8</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                                      <object class="GtkScrolledWindow" id="scrolledwindow8">
                                         <property name="height_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -647,107 +658,94 @@ private</property>
                                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                         <property name="shadow_type">GTK_SHADOW_IN</property>
                                         <child>
-                                          <widget class="GtkTreeView" id="go_signals">
+                                          <object class="GtkTreeView" id="go_signals">
                                             <property name="visible">True</property>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
                                     <child>
-                                      <widget class="GtkHButtonBox" id="hbuttonbox8">
+                                      <object class="GtkHButtonBox" id="hbuttonbox8">
                                         <property name="visible">True</property>
                                         <property name="spacing">6</property>
                                         <property name="layout_style">GTK_BUTTONBOX_END</property>
                                         <child>
-                                          <widget class="GtkButton" id="go_signals_remove">
+                                          <object class="GtkButton" id="go_signals_remove">
                                             <property name="visible">True</property>
                                             <property name="label">gtk-remove</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
+                                          </object>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="go_signals_add">
+                                          <object class="GtkButton" id="go_signals_add">
                                             <property name="visible">True</property>
                                             <property name="label">gtk-add</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label54">
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label54">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Signals</property>
-                                  </widget>
+                                  </object>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="position">2</property>
                                     <property name="tab_fill">False</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label37">
+                        <child type="label">
+                          <object class="GtkLabel" id="label37">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Class Elements&lt;/b&gt;</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>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
+                  </object>
                 </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">GObject Class	</property>
-                  </widget>
+                  </object>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">1</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkTable" id="table1">
+              <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
                 <property name="n_rows">4</property>
                 <property name="n_columns">4</property>
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkEntry" id="author_email">
+                  <object class="GtkEntry" id="author_email">
                     <property name="visible">True</property>
                     <property name="activates_default">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">3</property>
                     <property name="right_attach">4</property>
@@ -757,11 +755,11 @@ private</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label14">
+                  <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Author Email:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="right_attach">3</property>
@@ -772,10 +770,10 @@ private</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="author_name">
+                  <object class="GtkEntry" id="author_name">
                     <property name="visible">True</property>
                     <property name="activates_default">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -785,11 +783,11 @@ private</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label12">
+                  <object class="GtkLabel" id="label12">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Author Name:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
@@ -798,12 +796,16 @@ private</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="license">
+                  <object class="GtkComboBox" id="license">
                     <property name="visible">True</property>
-                    <property name="items" translatable="yes">General Public License (GPL)
-Lesser General Public License (LGPL)
-No License</property>
-                  </widget>
+                    <property name="model">model2</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer2"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">4</property>
@@ -813,11 +815,11 @@ No License</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label8">
+                  <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">License:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
@@ -826,27 +828,27 @@ No License</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label1">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Header File:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox2">
+                  <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
                     <property name="spacing">4</property>
                     <child>
-                      <widget class="GtkEntry" id="header_file">
+                      <object class="GtkEntry" id="header_file">
                         <property name="visible">True</property>
                         <property name="activates_default">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">4</property>
@@ -854,11 +856,11 @@ No License</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label6">
+                  <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Source File:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
@@ -867,16 +869,16 @@ No License</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox6">
+                  <object class="GtkHBox" id="hbox6">
                     <property name="visible">True</property>
                     <property name="spacing">4</property>
                     <child>
-                      <widget class="GtkEntry" id="source_file">
+                      <object class="GtkEntry" id="source_file">
                         <property name="visible">True</property>
                         <property name="activates_default">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">4</property>
@@ -885,99 +887,99 @@ No License</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
                 <child>
-                  <widget class="GtkCheckButton" id="add_project">
+                  <object class="GtkCheckButton" id="add_project">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Add to Project</property>
-                    <property name="response_id">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="add_repository">
+                  <object class="GtkCheckButton" id="add_repository">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Add to Repository</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancel_button">
+              <object class="GtkButton" id="cancel_button">
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="create_button">
+              <object class="GtkButton" id="create_button">
                 <property name="visible">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
-                <property name="response_id">-3</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkImage" id="image1">
+                      <object class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="stock">gtk-save</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label4">
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Create</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="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-3">create_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/class-gen/plugin.h b/plugins/class-gen/plugin.h
index 0402f02..c0271be 100644
--- a/plugins/class-gen/plugin.h
+++ b/plugins/class-gen/plugin.h
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <libanjuta/anjuta-plugin.h>
 
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-class-gen-plugin.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-class-gen-plugin.glade"
 #define CLASS_TEMPLATE PACKAGE_DATA_DIR"/class-templates/"
 
 extern GType class_gen_plugin_get_type (GTypeModule *module);
diff --git a/plugins/class-gen/window.c b/plugins/class-gen/window.c
index 7628658..eb15ee8 100644
--- a/plugins/class-gen/window.c
+++ b/plugins/class-gen/window.c
@@ -28,7 +28,7 @@
 
 #include <ctype.h>
 
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-class-gen-plugin.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-class-gen-plugin.glade"
 
 #define CC_HEADER_TEMPLATE PACKAGE_DATA_DIR"/class-templates/cc-header.tpl"
 #define CC_SOURCE_TEMPLATE PACKAGE_DATA_DIR"/class-templates/cc-source.tpl"
@@ -39,7 +39,7 @@
 typedef struct _CgWindowPrivate CgWindowPrivate;
 struct _CgWindowPrivate
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml;
 	GtkWidget *window;
 	
 	CgElementEditor *editor_cc;
@@ -61,7 +61,7 @@ enum {
 	PROP_0,
 
 	/* Construct only */
-	PROP_GLADE_XML
+	PROP_BUILDER_XML
 };
 
 static GObjectClass *parent_class = NULL;
@@ -171,7 +171,7 @@ cg_window_fetch_string (CgWindow *window,
 	CgWindowPrivate *priv;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	widget = glade_xml_get_widget (priv->gxml, id);
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->bxml, id));
 
 	g_return_val_if_fail (widget != NULL, NULL);
 
@@ -191,7 +191,7 @@ cg_window_fetch_integer (CgWindow *window,
 	CgWindowPrivate *priv;
 	
 	priv = CG_WINDOW_PRIVATE(window);
-	widget = glade_xml_get_widget(priv->gxml, id);
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->bxml, id));
 	
 	g_return_val_if_fail(widget != NULL, 0);
 	
@@ -213,7 +213,7 @@ cg_window_fetch_boolean (CgWindow *window,
 	CgWindowPrivate *priv;
 	
 	priv = CG_WINDOW_PRIVATE (window);
-	widget = glade_xml_get_widget (priv->gxml, id);
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->bxml, id));
 	
 	g_return_val_if_fail (widget != NULL, FALSE);
 	
@@ -269,10 +269,10 @@ cg_window_validate_cc (CgWindow *window)
 	if (priv->validator != NULL) g_object_unref (G_OBJECT (priv->validator));
 	
 	priv->validator = cg_validator_new (
-		glade_xml_get_widget (priv->gxml, "create_button"),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "cc_name")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "header_file")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "source_file")), NULL);
+		GTK_WIDGET (gtk_builder_get_object (priv->bxml, "create_button")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "cc_name")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "header_file")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "source_file")), NULL);
 }
 
 static void
@@ -284,13 +284,13 @@ cg_window_validate_go (CgWindow *window)
 	if (priv->validator != NULL) g_object_unref (G_OBJECT (priv->validator));
 	
 	priv->validator = cg_validator_new (
-		glade_xml_get_widget (priv->gxml, "create_button"),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "go_name")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "go_prefix")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "go_type")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "go_func_prefix")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "header_file")),
-		GTK_ENTRY (glade_xml_get_widget (priv->gxml, "source_file")), NULL);
+		GTK_WIDGET (gtk_builder_get_object (priv->bxml, "create_button")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "go_name")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "go_prefix")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "go_type")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "go_func_prefix")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "header_file")),
+		GTK_ENTRY (gtk_builder_get_object (priv->bxml, "source_file")), NULL);
 }
 
 static void
@@ -351,15 +351,15 @@ cg_window_add_project_toggled_cb (GtkToggleButton *button,
 
 	if (gtk_toggle_button_get_active (button) == FALSE)
 	{
-		GtkWidget* widget = glade_xml_get_widget(priv->gxml, "add_repository");
+		GtkWidget* widget = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "add_repository"));
 		gtk_widget_set_sensitive (widget, FALSE);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widget),
 		                              FALSE);
 	}
 	else
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-			priv->gxml, "add_repository"), TRUE);
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+			priv->bxml, "add_repository")), TRUE);
 	}
 }
 
@@ -379,8 +379,8 @@ cg_window_cc_name_changed_cb (GtkEntry *entry,
 	window = CG_WINDOW (user_data);
 	priv = CG_WINDOW_PRIVATE (window);
 
-	file_header = glade_xml_get_widget (priv->gxml, "header_file");
-	file_source = glade_xml_get_widget (priv->gxml, "source_file");
+	file_header = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "header_file"));
+	file_source = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "source_file"));
 
 	str_filebase = cg_window_class_name_to_file_name (
 		gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -421,12 +421,12 @@ cg_window_go_name_changed_cb (GtkEntry *entry,
 	window = CG_WINDOW (user_data);
 	priv = CG_WINDOW_PRIVATE (window);
 	
-	type_prefix = glade_xml_get_widget (priv->gxml, "go_prefix");
-	type_name = glade_xml_get_widget (priv->gxml, "go_type");
-	func_prefix = glade_xml_get_widget (priv->gxml, "go_func_prefix");
+	type_prefix = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "go_prefix"));
+	type_name = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "go_type"));
+	func_prefix = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "go_func_prefix"));
 
-	file_header = glade_xml_get_widget (priv->gxml, "header_file");
-	file_source = glade_xml_get_widget (priv->gxml, "source_file");
+	file_header = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "header_file"));
+	file_source = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "source_file"));
 
 	name = gtk_entry_get_text (GTK_ENTRY (entry));
 	cg_transform_custom_c_type_to_g_type (name, &str_type_prefix,
@@ -472,16 +472,16 @@ cg_window_associate_browse_button (GladeXML *xml,
 #endif
 
 static void
-cg_window_set_glade_xml (CgWindow *window,
-                         GladeXML *xml)
+cg_window_set_builder (CgWindow *window,
+                         GtkBuilder *xml)
 {
 	CgWindowPrivate *priv;
 	priv = CG_WINDOW_PRIVATE (window);
 
-	priv->gxml = xml;
-	g_object_ref (priv->gxml);
+	priv->bxml = xml;
+	g_object_ref (priv->bxml);
 
-	priv->window = glade_xml_get_widget (priv->gxml, "classgen_main");
+	priv->window = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "classgen_main"));
 
 #if 0
 	cg_window_associate_browse_button (priv->gxml, "browse_header",
@@ -492,9 +492,9 @@ cg_window_set_glade_xml (CgWindow *window,
 #endif
 
 	priv->editor_cc = cg_element_editor_new (
-		GTK_TREE_VIEW (glade_xml_get_widget (priv->gxml, "cc_elements")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "cc_elements_add")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "cc_elements_remove")),
+		GTK_TREE_VIEW (gtk_builder_get_object (priv->bxml, "cc_elements")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "cc_elements_add")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "cc_elements_remove")),
 		5,
 		"Scope", CG_ELEMENT_EDITOR_COLUMN_LIST, CC_SCOPE_LIST,
 		"Implementation", CG_ELEMENT_EDITOR_COLUMN_LIST, CC_IMPLEMENTATION_LIST,
@@ -503,9 +503,9 @@ cg_window_set_glade_xml (CgWindow *window,
 		"Arguments", CG_ELEMENT_EDITOR_COLUMN_ARGUMENTS);
 	
 	priv->editor_go_members = cg_element_editor_new (
-		GTK_TREE_VIEW (glade_xml_get_widget (priv->gxml, "go_members")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "go_members_add")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "go_members_remove")),
+		GTK_TREE_VIEW (gtk_builder_get_object (priv->bxml, "go_members")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "go_members_add")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "go_members_remove")),
 		4,
 		"Scope", CG_ELEMENT_EDITOR_COLUMN_LIST, GO_SCOPE_LIST,
 		"Type", CG_ELEMENT_EDITOR_COLUMN_STRING,
@@ -513,9 +513,9 @@ cg_window_set_glade_xml (CgWindow *window,
 		"Arguments", CG_ELEMENT_EDITOR_COLUMN_ARGUMENTS);
 	
 	priv->editor_go_properties = cg_element_editor_new(
-		GTK_TREE_VIEW (glade_xml_get_widget (priv->gxml, "go_properties")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "go_properties_add")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "go_properties_remove")),
+		GTK_TREE_VIEW (gtk_builder_get_object (priv->bxml, "go_properties")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "go_properties_add")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "go_properties_remove")),
 		7,
 		"Name", CG_ELEMENT_EDITOR_COLUMN_STRING,
 		"Nick", CG_ELEMENT_EDITOR_COLUMN_STRING,
@@ -526,9 +526,9 @@ cg_window_set_glade_xml (CgWindow *window,
 		"Flags", CG_ELEMENT_EDITOR_COLUMN_FLAGS, GO_PROPERTY_FLAGS);
 	
 	priv->editor_go_signals = cg_element_editor_new(
-		GTK_TREE_VIEW (glade_xml_get_widget (priv->gxml, "go_signals")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "go_signals_add")),
-		GTK_BUTTON (glade_xml_get_widget (priv->gxml, "go_signals_remove")),
+		GTK_TREE_VIEW (gtk_builder_get_object (priv->bxml, "go_signals")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "go_signals_add")),
+		GTK_BUTTON (gtk_builder_get_object (priv->bxml, "go_signals_remove")),
 		5,
 		"Type", CG_ELEMENT_EDITOR_COLUMN_STRING,
 		"Name", CG_ELEMENT_EDITOR_COLUMN_STRING,
@@ -539,32 +539,32 @@ cg_window_set_glade_xml (CgWindow *window,
 	/* Active item property in glade cannot be set because no GtkTreeModel
 	 * is assigned. */
 	gtk_combo_box_set_active (
-		GTK_COMBO_BOX (glade_xml_get_widget (priv->gxml, "license")), 0);
+		GTK_COMBO_BOX (gtk_builder_get_object (priv->bxml, "license")), 0);
 
 	gtk_combo_box_set_active (
-		GTK_COMBO_BOX (glade_xml_get_widget (priv->gxml, "cc_inheritance")),
+		GTK_COMBO_BOX (gtk_builder_get_object (priv->bxml, "cc_inheritance")),
 		0);
 
 	/* This revalidates the appropriate validator */
 	g_signal_connect (
-		G_OBJECT (glade_xml_get_widget (priv->gxml, "top_notebook")),
+		G_OBJECT (gtk_builder_get_object (priv->bxml, "top_notebook")),
 		"switch-page", G_CALLBACK (cg_window_top_notebook_switch_page_cb),
 		window);
 	
 	g_signal_connect (
-		G_OBJECT (glade_xml_get_widget (priv->gxml, "go_name")), "changed",
+		G_OBJECT (gtk_builder_get_object (priv->bxml, "go_name")), "changed",
 		G_CALLBACK (cg_window_go_name_changed_cb), window);
 
 	g_signal_connect (
-		G_OBJECT (glade_xml_get_widget (priv->gxml, "cc_name")), "changed",
+		G_OBJECT (gtk_builder_get_object (priv->bxml, "cc_name")), "changed",
 		G_CALLBACK (cg_window_cc_name_changed_cb), window);
 
 	g_signal_connect (
-		G_OBJECT (glade_xml_get_widget(priv->gxml, "add_project")), "toggled",
+		G_OBJECT (gtk_builder_get_object (priv->bxml, "add_project")), "toggled",
 		G_CALLBACK (cg_window_add_project_toggled_cb), window);
 
 	cg_window_add_project_toggled_cb (GTK_TOGGLE_BUTTON (
-		glade_xml_get_widget (priv->gxml, "add_project")), window);
+		gtk_builder_get_object (priv->bxml, "add_project")), window);
 
 	/* Selected page is CC */
 	cg_window_validate_cc (window);
@@ -708,7 +708,7 @@ cg_window_init (CgWindow *window)
 	CgWindowPrivate *priv;
 	priv = CG_WINDOW_PRIVATE (window);
 
-	priv->gxml = NULL;
+	priv->bxml = NULL;
 	priv->window = NULL;
 	
 	priv->editor_cc = NULL;
@@ -740,8 +740,8 @@ cg_window_finalize (GObject *object)
 	if (priv->validator != NULL)
 		g_object_unref (G_OBJECT (priv->validator));
 
-	if (priv->gxml != NULL)
-		g_object_unref (G_OBJECT (priv->gxml));
+	if (priv->bxml != NULL)
+		g_object_unref (G_OBJECT (priv->bxml));
 
 	gtk_widget_destroy(priv->window);
 
@@ -764,9 +764,9 @@ cg_window_set_property (GObject *object,
 
 	switch (prop_id)
 	{
-	case PROP_GLADE_XML:
-		cg_window_set_glade_xml (window,
-		                         GLADE_XML (g_value_get_object (value)));
+	case PROP_BUILDER_XML:
+		cg_window_set_builder (window,
+		                         GTK_BUILDER (g_value_get_object (value)));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -790,8 +790,8 @@ cg_window_get_property (GObject *object,
 
 	switch (prop_id)
 	{
-	case PROP_GLADE_XML:
-		g_value_set_object (value, G_OBJECT (priv->gxml));
+	case PROP_BUILDER_XML:
+		g_value_set_object (value, G_OBJECT (priv->bxml));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -812,11 +812,11 @@ cg_window_class_init (CgWindowClass *klass)
 	object_class->get_property = cg_window_get_property;
 
 	g_object_class_install_property (object_class,
-	                                 PROP_GLADE_XML,
-	                                 g_param_spec_object ("glade-xml",
-	                                                      "Glade XML description",
+	                                 PROP_BUILDER_XML,
+	                                 g_param_spec_object ("builder-xml",
+	                                                      "GtkBuilder",
 	                                                      _("XML description of the user interface"),
-	                                                      GLADE_TYPE_XML,
+	                                                      G_TYPE_OBJECT,
 	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
@@ -851,13 +851,18 @@ cg_window_get_type (void)
 CgWindow *
 cg_window_new (void)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new();
 	GObject *window;
+	GError* error = NULL;
 
-	gxml = glade_xml_new (GLADE_FILE, NULL, NULL);
-	if (gxml == NULL) return NULL;
-	
-	window = g_object_new (CG_TYPE_WINDOW, "glade-xml", gxml, NULL);
+	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+		return NULL;
+	}
+
+	window = g_object_new (CG_TYPE_WINDOW, "builder-xml", bxml, NULL);
 	return CG_WINDOW (window);
 }
 
@@ -892,7 +897,7 @@ cg_window_create_value_heap (CgWindow *window)
 	gchar *base_suffix;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	notebook = GTK_NOTEBOOK (glade_xml_get_widget (priv->gxml,
+	notebook = GTK_NOTEBOOK (gtk_builder_get_object (priv->bxml,
 	                                               "top_notebook"));
 
 	values = npw_value_heap_new ();
@@ -1029,7 +1034,7 @@ cg_window_get_header_template (CgWindow *window)
 	GtkNotebook *notebook;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	notebook = GTK_NOTEBOOK (glade_xml_get_widget (priv->gxml,
+	notebook = GTK_NOTEBOOK (gtk_builder_get_object (priv->bxml,
 	                                               "top_notebook"));
 	
 	g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
@@ -1053,7 +1058,7 @@ cg_window_get_header_file(CgWindow *window)
 	GtkEntry *entry;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	entry = GTK_ENTRY (glade_xml_get_widget (priv->gxml, "header_file"));
+	entry = GTK_ENTRY (gtk_builder_get_object (priv->bxml, "header_file"));
 	
 	g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
 	return gtk_entry_get_text (entry);
@@ -1066,7 +1071,7 @@ cg_window_get_source_template(CgWindow *window)
 	GtkNotebook *notebook;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	notebook = GTK_NOTEBOOK (glade_xml_get_widget (priv->gxml,
+	notebook = GTK_NOTEBOOK (gtk_builder_get_object (priv->bxml,
 	                                               "top_notebook"));
 	
 	g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
@@ -1090,7 +1095,7 @@ cg_window_get_source_file (CgWindow *window)
 	GtkEntry *entry;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	entry = GTK_ENTRY (glade_xml_get_widget (priv->gxml, "source_file"));
+	entry = GTK_ENTRY (gtk_builder_get_object (priv->bxml, "source_file"));
 	
 	g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
 	return gtk_entry_get_text (entry);
@@ -1104,7 +1109,7 @@ cg_window_set_add_to_project (CgWindow *window,
 	GtkCheckButton *button;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	button = GTK_CHECK_BUTTON (glade_xml_get_widget (priv->gxml,
+	button = GTK_CHECK_BUTTON (gtk_builder_get_object (priv->bxml,
 	                                                 "add_project"));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), enable);
@@ -1118,7 +1123,7 @@ cg_window_set_add_to_repository (CgWindow *window,
 	GtkCheckButton *button;
 
 	priv = CG_WINDOW_PRIVATE (window);
-	button = GTK_CHECK_BUTTON (glade_xml_get_widget (priv->gxml,
+	button = GTK_CHECK_BUTTON (gtk_builder_get_object (priv->bxml,
 	                                                 "add_repository"));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), enable);
@@ -1150,7 +1155,7 @@ cg_window_enable_add_to_project (CgWindow *window,
 	GtkWidget *widget;
 	
 	priv = CG_WINDOW_PRIVATE (window);
-	widget = glade_xml_get_widget (priv->gxml, "add_project");
+	widget = gtk_builder_get_object (priv->bxml, "add_project");
 	
 	gtk_widget_set_sensitive (widget, enable);
 }
@@ -1163,7 +1168,7 @@ cg_window_enable_add_to_repository (CgWindow *window,
 	GtkWidget *widget;
 	
 	priv = CG_WINDOW_PRIVATE (window);
-	widget = glade_xml_get_widget (priv->gxml, "add_repository");
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->bxml, "add_repository"));
 	
 	gtk_widget_set_sensitive (widget, enable);
 }
@@ -1176,7 +1181,7 @@ cg_window_set_author (CgWindow *window,
 	GtkEntry* entry;
 	
 	priv = CG_WINDOW_PRIVATE (window);
-	entry = GTK_ENTRY(glade_xml_get_widget (priv->gxml, "author_name"));
+	entry = GTK_ENTRY(gtk_builder_get_object (priv->bxml, "author_name"));
 	
 	gtk_entry_set_text (entry, author);
 }
@@ -1189,7 +1194,7 @@ cg_window_set_email (CgWindow *window,
 	GtkEntry* entry;
 	
 	priv = CG_WINDOW_PRIVATE (window);
-	entry = GTK_ENTRY(glade_xml_get_widget (priv->gxml, "author_email"));
+	entry = GTK_ENTRY(gtk_builder_get_object (priv->bxml, "author_email"));
 	
 	gtk_entry_set_text (entry, email);
 }
diff --git a/plugins/debug-manager/Makefile.am b/plugins/debug-manager/Makefile.am
index e8113dd..14ceb13 100644
--- a/plugins/debug-manager/Makefile.am
+++ b/plugins/debug-manager/Makefile.am
@@ -22,7 +22,6 @@ plugin_LTLIBRARIES = libanjuta-debug-manager.la
 libanjuta_debug_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_debug_manager_la_LIBADD = \
-	$(GLADE_LIBS) \
 	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS)
 
diff --git a/plugins/debug-manager/anjuta-debug-manager.glade b/plugins/debug-manager/anjuta-debug-manager.glade
index 9db05c5..b0e9d54 100644
--- a/plugins/debug-manager/anjuta-debug-manager.glade
+++ b/plugins/debug-manager/anjuta-debug-manager.glade
@@ -1,415 +1,406 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="attach_process_dialog">
+<interface>
+  <object class="GtkDialog" id="attach_process_dialog">
     <property name="title" translatable="yes">Attach to process</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkHBox" id="hbox8">
+          <object class="GtkHBox" id="hbox8">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label1">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Process to attach to:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">attach_process_tv</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</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_AUTOMATIC</property>
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="attach_process_tv">
+                      <object class="GtkTreeView" id="attach_process_tv">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="reorderable">True</property>
                         <property name="rules_hint">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox1125">
+                  <object class="GtkHBox" id="hbox1125">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox1123">
+                      <object class="GtkVBox" id="vbox1123">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkCheckButton" id="checkb_hide_paths">
+                          <object class="GtkCheckButton" id="checkb_hide_paths">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">_Hide paths</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="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="checkb_hide_params">
+                          <object class="GtkCheckButton" id="checkb_hide_params">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Hide process para_meters</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>
                     <child>
-                      <widget class="GtkCheckButton" id="checkb_process_tree">
+                      <object class="GtkCheckButton" id="checkb_process_tree">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Display process _tree</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>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="padding">5</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="padding">5</property>
             <property name="position">2</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_END</property>
             <child>
-              <widget class="GtkButton" id="attach_process_update_button">
+              <object class="GtkButton" id="attach_process_update_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="response_id">-10</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment2">
+                  <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox3">
+                      <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
-                          <widget class="GtkImage" id="image2">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-refresh</property>
-                          </widget>
+                          <object class="GtkImage" id="image2">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-refresh</property>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label3">
+                          <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">_Update</property>
                             <property name="use_underline">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>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="attach_process_attach_button">
+              <object class="GtkButton" id="attach_process_attach_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="response_id">-5</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>
                     <child>
-                      <widget class="GtkHBox" id="hbox4">
+                      <object class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
-                          <widget class="GtkImage" id="image3">
-			    <property name="visible">True</property>
-			    <property name="stock">gnome-stock-attach</property>
-                          </widget>
+                          <object class="GtkImage" id="image3">
+                            <property name="visible">True</property>
+                            <property name="stock">gnome-stock-attach</property>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label4">
+                          <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">_Attach</property>
                             <property name="use_underline">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>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button3">
+              <object class="GtkButton" id="button3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="breakpoints_dialog">
+    <action-widgets>
+      <action-widget response="-10">attach_process_update_button</action-widget>
+      <action-widget response="-5">attach_process_attach_button</action-widget>
+      <action-widget response="-6">button3</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="breakpoints_dialog">
     <property name="title" translatable="yes">Breakpoints</property>
     <property name="default_width">550</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkVBox" id="vbox2">
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkHBox" id="hbox5">
+              <object class="GtkHBox" id="hbox5">
                 <property name="visible">True</property>
                 <property name="spacing">10</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_AUTOMATIC</property>
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="breakpoints_tv">
+                      <object class="GtkTreeView" id="breakpoints_tv">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="reorderable">True</property>
                         <property name="rules_hint">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="vbox3">
+                  <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkVButtonBox" id="vbuttonbox1">
+                      <object class="GtkVButtonBox" id="vbuttonbox1">
                         <property name="visible">True</property>
                         <property name="spacing">5</property>
                         <property name="layout_style">GTK_BUTTONBOX_START</property>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_add_button">
+                          <object class="GtkButton" id="breakpoints_add_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label">gtk-add</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_remove_button">
+                          <object class="GtkButton" id="breakpoints_remove_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label">gtk-remove</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_jumpto_button">
+                          <object class="GtkButton" id="breakpoints_jumpto_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label">gtk-jump-to</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_properties_button">
+                          <object class="GtkButton" id="breakpoints_properties_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label">gtk-properties</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_enableall_button">
+                          <object class="GtkButton" id="breakpoints_enableall_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label" translatable="yes">Enable _all</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">4</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_disableall_button">
+                          <object class="GtkButton" id="breakpoints_disableall_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label" translatable="yes">_Disable all</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">5</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="breakpoints_removeall_button">
+                          <object class="GtkButton" id="breakpoints_removeall_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="label" translatable="yes">_Remove all</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">6</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                       </packing>
                     </child>
-                  </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>
           <packing>
             <property name="position">2</property>
           </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>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="add_watch_dialog">
+  </object>
+  <object class="GtkDialog" id="add_watch_dialog">
     <property name="title" translatable="yes">Add Watch</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <signal name="close" handler="gtk_widget_hide" object="breakpoint_property_dialog"/>
+    <signal handler="gtk_widget_hide" name="close" object="breakpoint_property_dialog"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="table1">
+          <object class="GtkTable" id="table1">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="n_rows">2</property>
@@ -417,67 +408,65 @@
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
             <child>
-              <widget class="GtkCheckButton" id="auto_update_check">
+              <object class="GtkCheckButton" id="auto_update_check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">_Automatic update</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="name_entry">
+              <object class="GtkEntry" id="add_watch_name_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label6">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Name:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">name_entry</property>
-              </widget>
+                <property name="mnemonic_widget">add_watch_name_entry</property>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancel_button">
+              <object class="GtkButton" id="cancel_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="add_button">
+              <object class="GtkButton" id="add_watch_add_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -485,31 +474,34 @@
                 <property name="has_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="change_watch_dialog">
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">add_watch_add_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="change_watch_dialog">
     <property name="title" translatable="yes">Change Watch</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <signal name="close" handler="gtk_widget_hide" object="breakpoint_property_dialog"/>
+    <signal handler="gtk_widget_hide" name="close" object="breakpoint_property_dialog"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="table2">
+          <object class="GtkTable" id="table2">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="n_rows">2</property>
@@ -517,7 +509,7 @@
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
             <child>
-              <widget class="GtkEntry" id="name_entry">
+              <object class="GtkEntry" id="change_watch_name_entry">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -525,77 +517,76 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="editable">False</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="value_entry">
+              <object class="GtkEntry" id="value_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="activates_default">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="value_label">
+              <object class="GtkLabel" id="change_watch_value_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Value:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value_entry</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="name_label">
+              <object class="GtkLabel" id="change_watch_name_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Name:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">name_entry</property>
-              </widget>
+                <property name="mnemonic_widget">change_watch_name_entry</property>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area4">
+          <object class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="close_button">
+              <object class="GtkButton" id="change_watch_close_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="evaluate_button">
+              <object class="GtkButton" id="change_watch_evaluate_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -603,93 +594,98 @@
                 <property name="has_default">True</property>
                 <property name="label">gtk-apply</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-10</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="watch_dialog">
+    <action-widgets>
+      <action-widget response="-6">change_watch_close_button</action-widget>
+      <action-widget response="-10">change_watch_evaluate_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="watch_dialog">
     <property name="title" translatable="yes">Inspect/Evaluate</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <signal name="close" handler="gtk_widget_hide" object="breakpoint_property_dialog"/>
+    <signal handler="gtk_widget_hide" name="close" object="breakpoint_property_dialog"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkVBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow31">
+          <object class="GtkScrolledWindow" id="scrolledwindow31">
             <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>
             <child>
-              <widget class="GtkTreeView" id="value_treeview">
+              <object class="GtkTreeView" id="watch_value_treeview">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkHButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="close_button">
+              <object class="GtkButton" id="watch_close_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-7</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="add_button">
+              <object class="GtkButton" id="watch_add_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="inspect_evaluate_dialog">
+    <action-widgets>
+      <action-widget response="-7">watch_close_button</action-widget>
+      <action-widget response="-5">watch_add_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="inspect_evaluate_dialog">
     <property name="title" translatable="yes">Inspect/Evaluate</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <signal name="close" handler="gtk_widget_hide" object="breakpoint_property_dialog"/>
+    <signal handler="gtk_widget_hide" name="close" object="breakpoint_property_dialog"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox6">
+      <object class="GtkVBox" id="dialog-vbox6">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="table3">
+          <object class="GtkTable" id="table3">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="n_rows">3</property>
@@ -700,34 +696,34 @@
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkLabel" id="value_label">
+              <object class="GtkLabel" id="inspect_evaluate_value_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Value:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">scrolledwindow31</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow3">
+              <object class="GtkScrolledWindow" id="scrolledwindow3">
                 <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>
                 <child>
-                  <widget class="GtkTreeView" id="value_treeview">
+                  <object class="GtkTreeView" id="inspect_evaluate_value_treeview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -736,17 +732,17 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox1133">
+              <object class="GtkHBox" id="hbox1133">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEntry" id="name_entry">
+                  <object class="GtkEntry" id="inspect_evaluate_name_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="activates_default">True</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -755,38 +751,37 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="name_label">
+              <object class="GtkLabel" id="inspect_evaluate_name_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Name:</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area6">
+          <object class="GtkHButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="close_button">
+              <object class="GtkButton" id="inspect_evaluate_close_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-7</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="inspect_button">
+              <object class="GtkButton" id="inspect_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -794,57 +789,60 @@
                 <property name="has_default">True</property>
                 <property name="label">gtk-refresh</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-3</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="evaluate_button">
+              <object class="GtkButton" id="inspect_evaluate_evaluate_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-apply</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-10</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="add_button">
+              <object class="GtkButton" id="inspect_evaluate_add_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="breakpoint_properties_dialog">
+    <action-widgets>
+      <action-widget response="-7">inspect_evaluate_close_button</action-widget>
+      <action-widget response="-3">inspect_button</action-widget>
+      <action-widget response="-10">inspect_evaluate_evaluate_button</action-widget>
+      <action-widget response="-5">inspect_evaluate_add_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="breakpoint_properties_dialog">
     <property name="title" translatable="yes">Breakpoint properties</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <signal name="close" handler="gtk_widget_hide" object="breakpoint_property_dialog"/>
+    <signal handler="gtk_widget_hide" name="close" object="breakpoint_property_dialog"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="table4">
+          <object class="GtkTable" id="table4">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="n_rows">3</property>
@@ -852,28 +850,28 @@
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
             <child>
-              <widget class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEntry" id="breakpoint_location_entry">
+                  <object class="GtkEntry" id="breakpoint_location_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="activates_default">True</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="breakpoint_location_label">
+                  <object class="GtkLabel" id="breakpoint_location_label">
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Location</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="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -882,96 +880,95 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="breakpoint_pass_entry">
+              <object class="GtkEntry" id="breakpoint_pass_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="activates_default">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="breakpoint_condition_entry">
+              <object class="GtkEntry" id="breakpoint_condition_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="activates_default">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="breakpoint_pass_label">
+              <object class="GtkLabel" id="breakpoint_pass_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="This is the number of time that the program executes the line where a breakpoint is located. It is used as a list header, so I have tried to find a quite short name.">_Pass count:</property>
+                <property comments="This is the number of time that the program executes the line where a breakpoint is located. It is used as a list header, so I have tried to find a quite short name." name="label" translatable="yes">_Pass count:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">breakpoint_pass_entry</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="breakpoint_condition_label">
+              <object class="GtkLabel" id="breakpoint_condition_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Condition:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">breakpoint_condition_entry</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Location:</property>
                 <property name="use_underline">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkHButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancelbutton1">
+              <object class="GtkButton" id="cancelbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton1">
+              <object class="GtkButton" id="okbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
@@ -979,61 +976,64 @@
                 <property name="has_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="dialog_memory">
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="dialog_memory">
     <property name="title" translatable="yes">Memory</property>
     <property name="resizable">False</property>
     <child>
-      <widget class="GtkVBox" id="vbox4">
+      <object class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
         <property name="can_default">True</property>
         <property name="border_width">5</property>
         <child>
-          <widget class="GtkHBox" id="hbox2">
+          <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkVBox" id="vbox5">
+              <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEventBox" id="eventbox_up">
+                  <object class="GtkEventBox" id="eventbox_up">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
-                      <widget class="GtkArrow" id="arrow1">
+                      <object class="GtkArrow" id="arrow1">
                         <property name="visible">True</property>
                         <property name="arrow_type">GTK_ARROW_UP</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEventBox" id="eventbox_down">
+                  <object class="GtkEventBox" id="eventbox_down">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkArrow" id="arrow2">
+                      <object class="GtkArrow" id="arrow2">
                         <property name="visible">True</property>
                         <property name="arrow_type">GTK_ARROW_DOWN</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -1041,13 +1041,13 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkTextView" id="adr_textview">
+              <object class="GtkTextView" id="adr_textview">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -1055,20 +1055,20 @@
                 <property name="editable">False</property>
                 <property name="left_margin">5</property>
                 <property name="right_margin">5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkTextView" id="data_textview">
+              <object class="GtkTextView" id="data_textview">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="editable">False</property>
                 <property name="left_margin">10</property>
                 <property name="right_margin">10</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="pack_type">GTK_PACK_END</property>
@@ -1076,7 +1076,7 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkTextView" id="ascii_textview">
+              <object class="GtkTextView" id="ascii_textview">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -1084,19 +1084,19 @@
                 <property name="editable">False</property>
                 <property name="left_margin">5</property>
                 <property name="right_margin">5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="pack_type">GTK_PACK_END</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
         </child>
         <child>
-          <widget class="GtkHSeparator" id="hseparator1">
+          <object class="GtkHSeparator" id="hseparator1">
             <property name="visible">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="padding">5</property>
@@ -1104,10 +1104,10 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkLabel" id="memory_label">
+          <object class="GtkLabel" id="memory_label">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Enter an address in hexadecimal or select one in the data</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -1115,27 +1115,26 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="hbox7">
+          <object class="GtkHBox" id="hbox7">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkButton" id="button_inspect">
+              <object class="GtkButton" id="button_inspect">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label" translatable="yes">Inspect</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="adr_entry">
+              <object class="GtkEntry" id="adr_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">8</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -1143,19 +1142,18 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button_quit">
+              <object class="GtkButton" id="button_quit">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label">gtk-quit</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -1163,19 +1161,19 @@
             <property name="position">2</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="window.debugger.registers">
+  </object>
+  <object class="GtkDialog" id="window.debugger.registers">
     <property name="title" translatable="yes">CPU Registers</property>
     <property name="default_width">200</property>
     <property name="default_height">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox19">
+      <object class="GtkVBox" id="dialog-vbox19">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow27">
+          <object class="GtkScrolledWindow" id="scrolledwindow27">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">5</property>
@@ -1183,39 +1181,39 @@
             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
             <property name="shadow_type">GTK_SHADOW_IN</property>
             <child>
-              <widget class="GtkTreeView" id="debugger.registers.tv">
+              <object class="GtkTreeView" id="debugger.registers.tv">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area19">
+          <object class="GtkHButtonBox" id="dialog-action_area19">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="window.debugger.sharedlibs">
+  </object>
+  <object class="GtkDialog" id="window.debugger.sharedlibs">
     <property name="title" translatable="yes">Shared libraries</property>
     <property name="default_width">300</property>
     <property name="default_height">500</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox20">
+      <object class="GtkVBox" id="dialog-vbox20">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow28">
+          <object class="GtkScrolledWindow" id="scrolledwindow28">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">5</property>
@@ -1223,113 +1221,115 @@
             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
             <property name="shadow_type">GTK_SHADOW_IN</property>
             <child>
-              <widget class="GtkTreeView" id="debugger.sharedlibs.tv">
+              <object class="GtkTreeView" id="debugger.sharedlibs.tv">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area20">
+          <object class="GtkHButtonBox" id="dialog-action_area20">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="window.debugger.signals">
+  </object>
+  <object class="GtkDialog" id="window.debugger.signals">
     <property name="title" translatable="yes">Kernel Signals</property>
     <property name="default_width">500</property>
     <property name="default_height">600</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox23">
+      <object class="GtkVBox" id="dialog-vbox23">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow29">
+          <object class="GtkScrolledWindow" id="scrolledwindow29">
             <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>
             <child>
-              <widget class="GtkTreeView" id="debugger.signals.tv">
+              <object class="GtkTreeView" id="debugger.signals.tv">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area23">
+          <object class="GtkHButtonBox" id="dialog-action_area23">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="closebutton7">
+              <object class="GtkButton" id="closebutton7">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="window.debugger.signals.set">
+    <action-widgets>
+      <action-widget response="-6">closebutton7</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="window.debugger.signals.set">
     <property name="width_request">360</property>
     <property name="height_request">180</property>
     <property name="title" translatable="yes">Set Signal Property</property>
     <property name="resizable">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox24">
+      <object class="GtkVBox" id="dialog-vbox24">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkHBox" id="hbox1132">
+          <object class="GtkHBox" id="hbox1132">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkLabel" id="label12345">
+              <object class="GtkLabel" id="label12345">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Signal:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="lable.signal">
+              <object class="GtkLabel" id="lable.signal">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">SIGINT</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>
@@ -1337,32 +1337,32 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="hbox1131">
+          <object class="GtkHBox" id="hbox1131">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkLabel" id="label12346">
+              <object class="GtkLabel" id="label12346">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Description:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="lable.description">
+              <object class="GtkLabel" id="lable.description">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Program Interrupt</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>
@@ -1370,16 +1370,16 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHSeparator" id="hseparator6">
+          <object class="GtkHSeparator" id="hseparator6">
             <property name="visible">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">4</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkTable" id="table33">
+          <object class="GtkTable" id="table33">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="n_rows">2</property>
@@ -1387,151 +1387,149 @@
             <property name="column_spacing">11</property>
             <property name="row_spacing">10</property>
             <child>
-              <widget class="GtkToggleButton" id="toggle.pass">
+              <object class="GtkToggleButton" id="toggle.pass">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Yes</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="right_attach">3</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkToggleButton" id="toggle.print">
+              <object class="GtkToggleButton" id="toggle.print">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Yes</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkToggleButton" id="toggle.stop">
+              <object class="GtkToggleButton" id="toggle.stop">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Yes</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label12349">
+              <object class="GtkLabel" id="label12349">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Pass:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="right_attach">3</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label12348">
+              <object class="GtkLabel" id="label12348">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Print:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label12347">
+              <object class="GtkLabel" id="label12347">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Stop:</property>
-              </widget>
+              </object>
               <packing>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">5</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area24">
+          <object class="GtkHButtonBox" id="dialog-action_area24">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="closebutton8">
+              <object class="GtkButton" id="closebutton8">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button34">
+              <object class="GtkButton" id="button34">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="debugger_start_dialog">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">closebutton8</action-widget>
+      <action-widget response="-5">button34</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="debugger_start_dialog">
     <property name="title" translatable="yes">Start Debugger</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="default_width">400</property>
     <property name="default_height">300</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox25">
+      <object class="GtkVBox" id="dialog-vbox25">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkFrame" id="frame8">
+          <object class="GtkFrame" id="frame8">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment11">
+              <object class="GtkAlignment" id="alignment11">
                 <property name="visible">True</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow30">
+                  <object class="GtkScrolledWindow" id="scrolledwindow30">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">5</property>
@@ -1539,100 +1537,98 @@
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="programs_treeview">
+                      <object class="GtkTreeView" id="programs_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label12350">
+            <child type="label">
+              <object class="GtkLabel" id="label12350">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;Debugger:&lt;/b&gt;</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>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area25">
+          <object class="GtkHButtonBox" id="dialog-action_area25">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancelbutton5">
+              <object class="GtkButton" id="cancelbutton5">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton4">
+              <object class="GtkButton" id="okbutton4">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="debugger_command_dialog">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton5</action-widget>
+      <action-widget response="-5">okbutton4</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="debugger_command_dialog">
     <property name="title" translatable="yes">Debugger command</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox14">
+      <object class="GtkVBox" id="dialog-vbox14">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkHBox" id="hbox1134">
+          <object class="GtkHBox" id="hbox1134">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkLabel" id="label8">
+              <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Debugger command:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="debugger_command_entry">
+              <object class="GtkEntry" id="debugger_command_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -1640,29 +1636,31 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area14">
+          <object class="GtkHButtonBox" id="dialog-action_area14">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="closebutton9">
+              <object class="GtkButton" id="closebutton9">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-7</property>
-              </widget>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="source_paths_dialog">
+    <action-widgets>
+      <action-widget response="-7">closebutton9</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="source_paths_dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Source Directories</property>
@@ -1670,12 +1668,12 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_pager_hint">True</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox16">
+      <object class="GtkVBox" id="dialog-vbox16">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkTable" id="table5">
+          <object class="GtkTable" id="table5">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="border_width">5</property>
@@ -1684,7 +1682,7 @@
             <property name="column_spacing">5</property>
             <property name="row_spacing">6</property>
             <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow6">
+              <object class="GtkScrolledWindow" id="scrolledwindow6">
                 <property name="width_request">480</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1693,40 +1691,39 @@
                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                 <property name="shadow_type">GTK_SHADOW_IN</property>
                 <child>
-                  <widget class="GtkTreeView" id="src_clist">
+                  <object class="GtkTreeView" id="src_clist">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFileChooserButton" id="src_entry">
+              <object class="GtkFileChooserButton" id="src_entry">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="border_width">1</property>
                 <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                 <property name="title" translatable="yes">Select one directory</property>
-              </widget>
+              </object>
               <packing>
                 <property name="y_options">GTK_SHRINK</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="add_button">
+              <object class="GtkButton" id="source_paths_add_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -1735,35 +1732,33 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox6">
+              <object class="GtkVBox" id="vbox6">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkButton" id="remove_button">
+                  <object class="GtkButton" id="remove_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-remove</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>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="up_button">
+                  <object class="GtkButton" id="up_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-go-up</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>
@@ -1771,22 +1766,21 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="down_button">
+                  <object class="GtkButton" id="down_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-go-down</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">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -1795,140 +1789,140 @@
                 <property name="x_options">GTK_SHRINK | GTK_FILL</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area16">
+          <object class="GtkHButtonBox" id="dialog-action_area16">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button6">
+              <object class="GtkButton" id="button6">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-redo</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button7">
+              <object class="GtkButton" id="button7">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-7</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="remote_dialog">
+    <action-widgets>
+      <action-widget response="-6">button6</action-widget>
+      <action-widget response="-7">button7</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="remote_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Connect to remote target</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox17">
+      <object class="GtkVBox" id="dialog-vbox17">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox9">
+          <object class="GtkVBox" id="vbox9">
             <property name="visible">True</property>
             <property name="spacing">6</property>
             <child>
-              <widget class="GtkRadioButton" id="tcpip_radio">
+              <object class="GtkRadioButton" id="tcpip_radio">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">TCP/IP Connection</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>
               </packing>
             </child>
             <child>
-              <widget class="GtkAlignment" id="tcpip_container">
+              <object class="GtkAlignment" id="tcpip_container">
                 <property name="visible">True</property>
                 <property name="border_width">6</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox10">
+                  <object class="GtkHBox" id="hbox10">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="spacing">6</property>
                     <child>
-                      <widget class="GtkLabel" id="label11">
+                      <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Address:</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="tcpip_address_entry">
+                      <object class="GtkEntry" id="tcpip_address_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                      </widget>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </object>
                       <packing>
                         <property name="position">1</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">Port:</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="tcpip_port_entry">
+                      <object class="GtkEntry" id="tcpip_port_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                      </widget>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </object>
                       <packing>
                         <property name="position">3</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkRadioButton" id="serial_radio">
+              <object class="GtkRadioButton" id="serial_radio">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Serial Line Connection</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">tcpip_radio</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -1936,118 +1930,118 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkAlignment" id="serial_container">
+              <object class="GtkAlignment" id="remote_serial_container">
                 <property name="visible">True</property>
                 <property name="border_width">6</property>
                 <child>
-                  <widget class="GtkEntry" id="serial_port_entry">
+                  <object class="GtkEntry" id="serial_port_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </widget>
+                    <property name="invisible_char">&#x25CF;</property>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area17">
+          <object class="GtkHButtonBox" id="dialog-action_area17">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
                 <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>
             </child>
             <child>
-              <widget class="GtkButton" id="button5">
+              <object class="GtkButton" id="button5">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="label">gtk-apply</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-10</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="button1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="label">gtk-connect</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-3</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="debug_manager_preferences">
+    <action-widgets>
+      <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">button5</action-widget>
+      <action-widget response="-3">button1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="debug_manager_preferences">
     <property name="title" translatable="yes">window1</property>
     <child>
-      <widget class="GtkVBox" id="preferences_container">
+      <object class="GtkVBox" id="preferences_container">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
-          <widget class="GtkFrame" id="frame6">
+          <object class="GtkFrame" id="frame6">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment6">
+              <object class="GtkAlignment" id="alignment6">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</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="spacing">6</property>
                     <child>
-                      <widget class="GtkRadioButton" id="local_radio">
+                      <object class="GtkRadioButton" id="local_radio">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Disable</property>
-                        <property name="response_id">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="preferences_toggle:bool:0:0:debug.manager.tcp.connection">
+                      <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:debug.manager.tcp.connection">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">TCP/IP Connection</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">local_radio</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -2055,68 +2049,67 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="tcp_container">
+                      <object class="GtkAlignment" id="tcp_container">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox6">
+                          <object class="GtkHBox" id="hbox6">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkLabel" id="label12">
+                              <object class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Address:</property>
-                              </widget>
+                              </object>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="preferences_entry:text::0:debug.manager.tcp.address">
+                              <object class="GtkEntry" id="preferences_entry:text::0:debug.manager.tcp.address">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
-                              </widget>
+                                <property name="invisible_char">&#x25CF;</property>
+                              </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="xalign">0</property>
                                 <property name="label" translatable="yes">Port:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="preferences_entry:text::0:debug.manager.tcp.port">
+                              <object class="GtkEntry" id="preferences_entry:text::0:debug.manager.tcp.port">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
-                              </widget>
+                                <property name="invisible_char">&#x25CF;</property>
+                              </object>
                               <packing>
                                 <property name="position">3</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="preferences_toggle:bool:0:0:debug.manager.serial.connection">
+                      <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:debug.manager.serial.connection">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Serial Line Connection</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">local_radio</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -2124,38 +2117,35 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="serial_container">
+                      <object class="GtkAlignment" id="debug_manager_serial_container">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <child>
-                          <widget class="GtkEntry" id="preferences_entry:text::0:debug.manager.serial.port">
+                          <object class="GtkEntry" id="preferences_entry:text::0:debug.manager.serial.port">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">●</property>
-                          </widget>
+                            <property name="invisible_char">&#x25CF;</property>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">4</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label10">
+            <child type="label">
+              <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">&lt;b&gt;Remote debugging&lt;/b&gt;</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>
@@ -2164,7 +2154,7 @@
         <child>
           <placeholder/>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/debug-manager/breakpoints.c b/plugins/debug-manager/breakpoints.c
index 5b674c3..ef8d95f 100644
--- a/plugins/debug-manager/breakpoints.c
+++ b/plugins/debug-manager/breakpoints.c
@@ -96,7 +96,7 @@ struct _BreakpointsDBase
 
 	GtkListStore *model;
 	
-	GladeXML *gxml;
+	GtkBuilder *bxml;
 	gchar *cond_history, *loc_history;
 
 	/* Widgets */	
@@ -1424,7 +1424,7 @@ on_session_load (AnjutaShell *shell, AnjutaSessionPhase phase, AnjutaSession *se
 static void
 breakpoints_dbase_edit_breakpoint (BreakpointsDBase *bd, BreakpointItem *bi)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *dialog;
 	GtkWidget *location_label, *location_entry;
 	GtkWidget *condition_entry, *condition_label;
@@ -1433,18 +1433,22 @@ breakpoints_dbase_edit_breakpoint (BreakpointsDBase *bd, BreakpointItem *bi)
 	gchar *location = NULL;
 	gchar *uri = NULL;
 	gboolean new_break = FALSE;
+	GError* error = NULL;
 
-	gxml = glade_xml_new (GLADE_FILE,
-						  "breakpoint_properties_dialog", NULL);
-	dialog = glade_xml_get_widget (gxml, "breakpoint_properties_dialog");
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_properties_dialog"));
 	gtk_window_set_transient_for (GTK_WINDOW (dialog),
 								  GTK_WINDOW (ANJUTA_PLUGIN (bd->plugin)->shell));
-	location_label = glade_xml_get_widget (gxml, "breakpoint_location_label");
-	location_entry = glade_xml_get_widget (gxml, "breakpoint_location_entry");
-	condition_entry = glade_xml_get_widget (gxml, "breakpoint_condition_entry");
-	condition_label = glade_xml_get_widget (gxml, "breakpoint_condition_label");
-	pass_entry = glade_xml_get_widget (gxml, "breakpoint_pass_entry");
-	pass_label = glade_xml_get_widget (gxml, "breakpoint_pass_label");
+	location_label = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_location_label"));
+	location_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_location_entry"));
+	condition_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_condition_entry"));
+	condition_label = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_condition_label"));
+	pass_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_pass_entry"));
+	pass_label = GTK_WIDGET (gtk_builder_get_object (bxml, "breakpoint_pass_label"));
 
 	if (bd->debugger != NULL)
 	{
@@ -1588,7 +1592,7 @@ breakpoints_dbase_edit_breakpoint (BreakpointsDBase *bd, BreakpointItem *bi)
 	g_free (uri);
 	g_free (location);
 	gtk_widget_destroy (dialog);
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 }
 
 /* Breakpoint actions list
diff --git a/plugins/debug-manager/plugin.c b/plugins/debug-manager/plugin.c
index a5c2b33..0d25ab0 100644
--- a/plugins/debug-manager/plugin.c
+++ b/plugins/debug-manager/plugin.c
@@ -706,12 +706,17 @@ on_debugger_command_entry_activate (GtkEntry *entry, DebugManagerPlugin *plugin)
 static void
 on_debugger_custom_command_activate (GtkAction * action, DebugManagerPlugin *plugin)
 {
-        GladeXML *gxml;
+        GtkBuilder *bxml = gtk_builder_new ();
         GtkWidget *win, *entry;
+		GError* error = NULL;
 
-        gxml = glade_xml_new (GLADE_FILE, "debugger_command_dialog", NULL);
-        win = glade_xml_get_widget (gxml, "debugger_command_dialog");
-        entry = glade_xml_get_widget (gxml, "debugger_command_entry");
+		if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+		{
+			g_warning ("Couldn't load builder file: %s", error->message);
+			g_error_free (error);
+		}
+        win = GTK_WIDGET (gtk_builder_get_object (bxml, "debugger_command_dialog"));
+        entry = GTK_WIDGET (gtk_builder_get_object (bxml, "debugger_command_entry"));
 
         gtk_window_set_transient_for (GTK_WINDOW (win),
                                                                   GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell));
@@ -721,7 +726,7 @@ on_debugger_custom_command_activate (GtkAction * action, DebugManagerPlugin *plu
         g_signal_connect (entry, "activate",
                                           G_CALLBACK (on_debugger_command_entry_activate),
                                           plugin);
-        g_object_unref (gxml);
+        g_object_unref (bxml);
 }
 
 /* Info callbacks
diff --git a/plugins/debug-manager/start.c b/plugins/debug-manager/start.c
index 7bba722..a1387d5 100644
--- a/plugins/debug-manager/start.c
+++ b/plugins/debug-manager/start.c
@@ -42,7 +42,6 @@
 #include <libanjuta/interfaces/ianjuta-file-savable.h>
 #include <libanjuta/anjuta-utils.h>
 
-#include <glade/glade-xml.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
@@ -137,7 +136,7 @@ struct _DmaStart
 #define ADD_SOURCE_DIALOG "source_paths_dialog"
 #define SOURCE_ENTRY "src_entry"
 #define SOURCE_LIST "src_clist"
-#define ADD_BUTTON "add_button"
+#define ADD_BUTTON "source_paths_add_button"
 #define REMOVE_BUTTON "remove_button"
 #define UP_BUTTON "up_button"
 #define DOWN_BUTTON "down_button"
@@ -720,7 +719,6 @@ on_toggle_process_tree (GtkToggleButton *togglebutton, AttachProcess * ap)
 static pid_t
 attach_process_show (AttachProcess * ap, GtkWindow *parent)
 {
-	GladeXML *gxml;
 	GtkTreeView *view;
 	GtkTreeStore *store;
 	GtkCellRenderer *renderer;
@@ -735,16 +733,23 @@ attach_process_show (AttachProcess * ap, GtkWindow *parent)
 
 	if (!ap->dialog)
 	{
-		gxml = glade_xml_new (GLADE_FILE, "attach_process_dialog", NULL);
-		ap->dialog = glade_xml_get_widget (gxml, "attach_process_dialog");
-		ap->treeview = glade_xml_get_widget (gxml, "attach_process_tv");
+		GtkBuilder *bxml = gtk_builder_new ();
+		GError* error = NULL;
+
+		if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+		{
+			g_warning ("Couldn't load builder file: %s", error->message);
+			g_error_free (error);
+		}
+		ap->dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "attach_process_dialog"));
+		ap->treeview = GTK_WIDGET (gtk_builder_get_object (bxml, "attach_process_tv"));
 		checkb_hide_paths = GTK_CHECK_BUTTON (
-								glade_xml_get_widget (gxml, "checkb_hide_paths"));
+								gtk_builder_get_object (bxml, "checkb_hide_paths"));
 		checkb_hide_params = GTK_CHECK_BUTTON (
-								glade_xml_get_widget (gxml, "checkb_hide_params"));
+								gtk_builder_get_object (bxml, "checkb_hide_params"));
 		checkb_process_tree = GTK_CHECK_BUTTON (
-								glade_xml_get_widget (gxml, "checkb_process_tree"));
-		g_object_unref (gxml);
+								gtk_builder_get_object (bxml, "checkb_process_tree"));
+		g_object_unref (bxml);
 	
 		view = GTK_TREE_VIEW (ap->treeview);
 		store = gtk_tree_store_new (COLUMNS_NB,
@@ -1040,7 +1045,7 @@ static void on_radio_toggled(GtkWidget* toggle_button, GtkWidget* container)
 static gboolean
 show_remote_dialog (DmaStart *this)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWindow *parent;
 	GtkWidget *dialog;
 	GtkEntry *tcpip_address_entry;
@@ -1049,31 +1054,33 @@ show_remote_dialog (DmaStart *this)
 	GtkToggleButton *serial_radio;
 	GtkToggleButton *tcpip_radio;
 	GtkWidget *container;
-	
+	GError* error = NULL;
 	gint res;
 
 	parent = GTK_WINDOW (this->plugin->shell);
-	gxml = glade_xml_new (GLADE_FILE, REMOTE_DEBUG_DIALOG, NULL);
-	if (gxml == NULL)
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
 	{
+		g_warning ("Couldn't load builder file: %s", error->message);
 		anjuta_util_dialog_error(parent, _("Missing file %s"), GLADE_FILE);
+		g_error_free (error);
 		return FALSE;
 	}
 
 	/* Fetch out the widget we care about for now */
-	dialog = glade_xml_get_widget (gxml, REMOTE_DEBUG_DIALOG);
-	tcpip_address_entry = GTK_ENTRY (glade_xml_get_widget (gxml, TCPIP_ADDRESS_ENTRY));
-	tcpip_port_entry = GTK_ENTRY (glade_xml_get_widget (gxml, TCPIP_PORT_ENTRY));
-	serial_port_entry = GTK_ENTRY (glade_xml_get_widget (gxml, SERIAL_PORT_ENTRY));
-	tcpip_radio = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gxml, TCPIP_RADIO));
-	serial_radio = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gxml, SERIAL_RADIO));
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, REMOTE_DEBUG_DIALOG));
+	tcpip_address_entry = GTK_ENTRY (gtk_builder_get_object (bxml, TCPIP_ADDRESS_ENTRY));
+	tcpip_port_entry = GTK_ENTRY (gtk_builder_get_object (bxml, TCPIP_PORT_ENTRY));
+	serial_port_entry = GTK_ENTRY (gtk_builder_get_object (bxml, SERIAL_PORT_ENTRY));
+	tcpip_radio = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TCPIP_RADIO));
+	serial_radio = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, SERIAL_RADIO));
 	
 	/* Connect signals */	
-	container = glade_xml_get_widget (gxml, TCPIP_CONTAINER);
+	container = GTK_WIDGET (gtk_builder_get_object (bxml, TCPIP_CONTAINER));
 	g_signal_connect (G_OBJECT (tcpip_radio), "toggled", G_CALLBACK (on_radio_toggled), container);
-	container = glade_xml_get_widget (gxml, SERIAL_CONTAINER);
+	container = GTK_WIDGET (gtk_builder_get_object (bxml, SERIAL_CONTAINER));
 	g_signal_connect (G_OBJECT (serial_radio), "toggled", G_CALLBACK (on_radio_toggled), container);	
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 
 	/* Populate the remote target */
 	if (this->remote_debugger)
@@ -1237,36 +1244,39 @@ static void
 add_source_show (DmaStart *this)
 {
 	AddSourceDialog dlg;
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *widget;
 	GtkWindow *parent;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GObject *button;
-	
+	GError* error = NULL;
+
 	parent = GTK_WINDOW (this->plugin->shell);
-	gxml = glade_xml_new (GLADE_FILE, ADD_SOURCE_DIALOG, NULL);
-	if (gxml == NULL)
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
 	{
+		g_warning ("Couldn't load builder file: %s", error->message);
 		anjuta_util_dialog_error(parent, _("Missing file %s"), GLADE_FILE);
+		g_error_free (error);
 		return;
 	}
 		
-	widget = glade_xml_get_widget (gxml, ADD_SOURCE_DIALOG);
-	dlg.tree = GTK_TREE_VIEW (glade_xml_get_widget (gxml, SOURCE_LIST));
-	dlg.entry = GTK_FILE_CHOOSER (glade_xml_get_widget (gxml, SOURCE_ENTRY));
+	widget = GTK_WIDGET (gtk_builder_get_object (bxml, ADD_SOURCE_DIALOG));
+	dlg.tree = GTK_TREE_VIEW (gtk_builder_get_object (bxml, SOURCE_LIST));
+	dlg.entry = GTK_FILE_CHOOSER (gtk_builder_get_object (bxml, SOURCE_ENTRY));
 	
 	/* Connect signals */	
-	button = G_OBJECT (glade_xml_get_widget (gxml, ADD_BUTTON));
+	button = gtk_builder_get_object (bxml, ADD_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_source_add_button), &dlg);
-	button = G_OBJECT (glade_xml_get_widget (gxml, REMOVE_BUTTON));
+	button = gtk_builder_get_object (bxml, REMOVE_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_source_remove_button), &dlg);
-	button = G_OBJECT (glade_xml_get_widget (gxml, UP_BUTTON));
+	button = gtk_builder_get_object (bxml, UP_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_source_up_button), &dlg);
-	button = G_OBJECT (glade_xml_get_widget (gxml, DOWN_BUTTON));
+	button = gtk_builder_get_object (bxml, DOWN_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_source_down_button), &dlg);
 	
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 
 	renderer = gtk_cell_renderer_text_new ();
 	column = gtk_tree_view_column_new_with_attributes (_("Path"), renderer, "text", 0, NULL);
diff --git a/plugins/debug-manager/watch.c b/plugins/debug-manager/watch.c
index 2c05f39..b02dc28 100644
--- a/plugins/debug-manager/watch.c
+++ b/plugins/debug-manager/watch.c
@@ -63,9 +63,9 @@ typedef struct _InspectDialog InspectDialog;
 #define ADD_WATCH_DIALOG "add_watch_dialog"
 #define CHANGE_WATCH_DIALOG "change_watch_dialog"
 #define INSPECT_EVALUATE_DIALOG "watch_dialog"
-#define NAME_ENTRY "name_entry"
+#define NAME_ENTRY "add_watch_name_entry"
 #define VALUE_ENTRY "value_entry"
-#define VALUE_TREE "value_treeview"
+#define VALUE_TREE "inspect_evaluate_value_treeview"
 #define AUTO_UPDATE_CHECK "auto_update_check"
 
 /* Private functions
@@ -85,19 +85,25 @@ on_entry_updated (const gchar *value, gpointer user_data, GError *err)
 static void
 debug_tree_inspect_evaluate_dialog (ExprWatch * ew, const gchar* expression)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	gint reply;
 	gchar *new_expr;
 	// const gchar *value;
 	InspectDialog dlg;
 	IAnjutaDebuggerVariableObject var = {NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, -1};
+	GError* error = NULL;
 
-	gxml = glade_xml_new (GLADE_FILE, INSPECT_EVALUATE_DIALOG, NULL);
-	dlg.dialog = glade_xml_get_widget (gxml, INSPECT_EVALUATE_DIALOG);
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	dlg.dialog = GTK_WIDGET (gtk_builder_get_object (bxml, INSPECT_EVALUATE_DIALOG));
 	gtk_window_set_transient_for (GTK_WINDOW (dlg.dialog),
 								  NULL);
-	dlg.treeview = glade_xml_get_widget (gxml, VALUE_TREE);
-	g_object_unref (gxml);
+	dlg.treeview = GTK_WIDGET (gtk_builder_get_object (bxml, VALUE_TREE));
+	g_object_unref (bxml);
 
 	/* Create debug tree */
 	dlg.tree = debug_tree_new_with_view (ANJUTA_PLUGIN (ew->plugin), GTK_TREE_VIEW (dlg.treeview));
@@ -141,20 +147,26 @@ debug_tree_inspect_evaluate_dialog (ExprWatch * ew, const gchar* expression)
 static void
 debug_tree_add_watch_dialog (ExprWatch *ew, const gchar* expression)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *dialog;
 	GtkWidget *name_entry;
 	GtkWidget *auto_update_check;
 	gint reply;
 	IAnjutaDebuggerVariableObject var = {NULL, NULL, NULL, NULL, FALSE, FALSE, FALSE, -1};
+	GError* error = NULL;
 
-	gxml = glade_xml_new (GLADE_FILE, ADD_WATCH_DIALOG, NULL);
-	dialog = glade_xml_get_widget (gxml, ADD_WATCH_DIALOG);
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, ADD_WATCH_DIALOG));
 	gtk_window_set_transient_for (GTK_WINDOW (dialog),
 								  NULL);
-	auto_update_check = glade_xml_get_widget (gxml, AUTO_UPDATE_CHECK);
-	name_entry = glade_xml_get_widget (gxml, NAME_ENTRY);
-	g_object_unref (gxml);
+	auto_update_check = GTK_WIDGET (gtk_builder_get_object (bxml, AUTO_UPDATE_CHECK));
+	name_entry = GTK_WIDGET (gtk_builder_get_object (bxml, NAME_ENTRY));
+	g_object_unref (bxml);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (auto_update_check), TRUE);
 	gtk_entry_set_text (GTK_ENTRY (name_entry), expression == NULL ? "" : expression);
diff --git a/plugins/document-manager/anjuta-document-manager.glade b/plugins/document-manager/anjuta-document-manager.glade
index f4cdd19..67fe19f 100644
--- a/plugins/document-manager/anjuta-document-manager.glade
+++ b/plugins/document-manager/anjuta-document-manager.glade
@@ -1,122 +1,152 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="preferences_dialog">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">1000</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">1000</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">10</property>
+  </object>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Top</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bottom</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Right</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="preferences_dialog">
     <property name="title" translatable="yes">window1</property>
     <child>
-      <widget class="GtkHBox" id="Documents">
+      <object class="GtkHBox" id="Documents">
         <property name="visible">True</property>
         <property name="border_width">5</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox31">
+          <object class="GtkVBox" id="vbox31">
             <property name="visible">True</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkFrame" id="frame46">
+              <object class="GtkFrame" id="frame46">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox1119">
+                  <object class="GtkVBox" id="vbox1119">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="spacing">5</property>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:save.automatic">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:save.automatic">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Enable files autosave</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>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkTable" id="table28">
+                      <object class="GtkTable" id="table28">
                         <property name="visible">True</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">5</property>
                         <property name="row_spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label115">
+                          <object class="GtkLabel" id="label115">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Save files interval in minutes</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label116">
+                          <object class="GtkLabel" id="label116">
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Save session interval in minutes</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="preferences_spin:int:10:0:autosave.timer">
+                          <object class="GtkSpinButton" id="preferences_spin:int:10:0:autosave.timer">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">10 1 1000 1 10 0</property>
+                            <property name="adjustment">adjustment1</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="preferences_spin:int:10:0:save.session.timer">
+                          <object class="GtkSpinButton" id="preferences_spin:int:10:0:save.session.timer">
                             <property name="can_focus">True</property>
-                            <property name="adjustment">10 0 1000 1 10 0</property>
+                            <property name="adjustment">adjustment2</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label12335">
+                <child type="label">
+                  <object class="GtkLabel" id="label12335">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Autosave&lt;/b&gt;</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>
               </packing>
@@ -127,53 +157,51 @@
             <child>
               <placeholder/>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vbox32">
+          <object class="GtkVBox" id="vbox32">
             <property name="visible">True</property>
             <property name="spacing">5</property>
             <child>
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame31">
+              <object class="GtkFrame" id="frame31">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox33">
+                  <object class="GtkVBox" id="vbox33">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="spacing">5</property>
                     <child>
-                      <widget class="GtkRadioButton" id="radiobutton9">
+                      <object class="GtkRadioButton" id="radiobutton9">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Sorted in opening order</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="expand">False</property>
                         <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.recent.first">
+                      <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.recent.first">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Sorted by most recent use</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton9</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -181,15 +209,14 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.ordering">
+                      <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.ordering">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Sorted in alphabetical order</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton9</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -197,15 +224,14 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.hide">
+                      <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.hide">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Do not show tabs</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobutton9</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -213,34 +239,37 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox27">
+                      <object class="GtkHBox" id="hbox27">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label117">
+                          <object class="GtkLabel" id="label117">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Position:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="preferences_combo:text:Top,Bottom,Left,Right:0:editor.tabs.pos">
+                          <object class="GtkComboBox" id="preferences_combo:text:Top,Bottom,Left,Right:0:editor.tabs.pos">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="items" translatable="yes">Top
-Bottom
-Left
-Right</property>
-                          </widget>
+                            <property name="model">model1</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer1"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">4</property>
                       </packing>
@@ -248,30 +277,27 @@ Right</property>
                     <child>
                       <placeholder/>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label113">
+                <child type="label">
+                  <object class="GtkLabel" id="label113">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Editor tabs&lt;/b&gt;</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>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/document-manager/plugin.c b/plugins/document-manager/plugin.c
index 2a65ac6..b9d1541 100644
--- a/plugins/document-manager/plugin.c
+++ b/plugins/document-manager/plugin.c
@@ -51,7 +51,7 @@
 #include "anjuta-bookmarks.h"
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-document-manager.ui"
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-document-manager.glade"
+#define PREFS_BUILDER PACKAGE_DATA_DIR"/glade/anjuta-document-manager.glade"
 #define ICON_FILE "anjuta-document-manager-plugin-48.png"
 
 #define ANJUTA_PIXMAP_BOOKMARK_TOGGLE     "anjuta-bookmark-toggle"
@@ -2116,15 +2116,20 @@ isavable_iface_init (IAnjutaFileSavableIface *iface)
 static void
 ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
 {
-	GladeXML* gxml;
+	GError* error = NULL;
+	GtkBuilder* bxml = gtk_builder_new ();
 	
 	/* Add preferences */
-	gxml = glade_xml_new (PREFS_GLADE, "preferences_dialog", NULL);
-		
-	anjuta_preferences_add_page (prefs,
-									gxml, "Documents", _("Documents"),  ICON_FILE);
-				
-	g_object_unref (G_OBJECT (gxml));
+	if (!gtk_builder_add_from_file (bxml, PREFS_BUILDER, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	anjuta_preferences_add_from_builder (prefs,
+									bxml, "Documents", _("Documents"),  ICON_FILE);
+
+	g_object_unref (G_OBJECT (bxml));
 }
 
 static void
diff --git a/plugins/file-manager/file-manager.glade b/plugins/file-manager/file-manager.glade
index 031d1ab..f9956af 100644
--- a/plugins/file-manager/file-manager.glade
+++ b/plugins/file-manager/file-manager.glade
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
-<glade-interface>
+<interface>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="filemanager_pref_window">
+  <object class="GtkWindow" id="filemanager_pref_window">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
-      <widget class="GtkVBox" id="filemanager_prefs">
+      <object class="GtkVBox" id="filemanager_prefs">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
-          <widget class="GtkFrame" id="frame1">
+          <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkLabel" id="label2">
+                      <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Root directory if no project is open:</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -37,36 +37,33 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFileChooserButton" id="preferences_folder:text:/:0:filemanager.root">
+                      <object class="GtkFileChooserButton" id="preferences_folder:text:/:0:filemanager.root">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_preview_label">False</property>
                         <property name="action">select-folder</property>
                         <property name="preview_widget_active">False</property>
                         <property name="title" translatable="yes">Choose Directory to show if no project is open</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="padding">5</property>
                         <property name="pack_type">end</property>
                         <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;Global&lt;/b&gt;</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="padding">5</property>
@@ -74,29 +71,29 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame2">
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:filemanager.filter.binary">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:filemanager.filter.binary">
                         <property name="label" translatable="yes">Do not show binary files (.o, .la, etc.)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -104,14 +101,14 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:filemanager.filter.hidden">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:filemanager.filter.hidden">
                         <property name="label" translatable="yes">Do not show hidden files</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -119,14 +116,14 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:filemanager.filter.backup">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:filemanager.filter.backup">
                         <property name="label" translatable="yes">Do not show backup files</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -134,42 +131,39 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:filemanager.filter.unversioned">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:filemanager.filter.unversioned">
                         <property name="label" translatable="yes">Do not show unversioned files</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label3">
+            <child type="label">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;Filter&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="padding">5</property>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/file-manager/plugin.c b/plugins/file-manager/plugin.c
index 9fb040b..b935c60 100644
--- a/plugins/file-manager/plugin.c
+++ b/plugins/file-manager/plugin.c
@@ -23,7 +23,6 @@
  */
 
 #include <config.h>
-#include <glade/glade-xml.h>
 #include <gio/gio.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
@@ -37,8 +36,8 @@
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/file-manager.ui"
 #define ICON_FILE "anjuta-file-manager-plugin-48.png"
-#define FILE_MANAGER_GLADE PACKAGE_DATA_DIR"/glade/file-manager.glade"
-#define FILE_MANAGER_GLADE_ROOT "filemanager_prefs"
+#define FILE_MANAGER_BUILDER PACKAGE_DATA_DIR"/glade/file-manager.glade"
+#define FILE_MANAGER_BUILDER_ROOT "filemanager_prefs"
 
 #define PREF_ROOT "filemanager.root"
 #define PREF_FILTER_BINARY "filemanager.filter.binary"
@@ -445,11 +444,16 @@ ipreferences_merge (IAnjutaPreferences* ipref,
 					AnjutaPreferences* prefs,
 					GError** e)
 {
-	GladeXML* gxml;
-	
-	gxml = glade_xml_new (FILE_MANAGER_GLADE, FILE_MANAGER_GLADE_ROOT, NULL);
-	
-	anjuta_preferences_add_page (prefs, gxml, FILE_MANAGER_GLADE_ROOT, _("File Manager"),
+	GError* error = NULL;
+	GtkBuilder* bxml = gtk_builder_new ();
+
+	if (!gtk_builder_add_from_file (bxml, FILE_MANAGER_BUILDER, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	anjuta_preferences_add_from_builder (prefs, bxml, FILE_MANAGER_BUILDER_ROOT, _("File Manager"),
 								 ICON_FILE);
 }
 
diff --git a/plugins/file-wizard/anjuta-file-wizard.glade b/plugins/file-wizard/anjuta-file-wizard.glade
index ee69456..118ddcb 100644
--- a/plugins/file-wizard/anjuta-file-wizard.glade
+++ b/plugins/file-wizard/anjuta-file-wizard.glade
@@ -1,283 +1,275 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="dialog.new.file">
+<interface>
+  <object class="GtkDialog" id="dialog.new.file">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">New File</property>
     <property name="resizable">False</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <signal name="delete_event" handler="on_new_file_cancelbutton_clicked"/>
+    <signal handler="on_new_file_cancelbutton_clicked" name="delete_event"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox1124">
+          <object class="GtkVBox" id="vbox1124">
             <property name="visible">True</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkVBox" id="vbox1126">
+              <object class="GtkVBox" id="vbox1126">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
                 <child>
-                  <widget class="GtkLabel" id="label12346">
+                  <object class="GtkLabel" id="label12346">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;File Information&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox1127">
+                  <object class="GtkHBox" id="hbox1127">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label12347">
+                      <object class="GtkLabel" id="label12347">
                         <property name="visible">True</property>
                         <property name="xpad">4</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkTable" id="table33">
+                      <object class="GtkTable" id="table33">
                         <property name="visible">True</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label3">
+                          <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="xpad">10</property>
                             <property name="ypad">5</property>
                             <property name="label" translatable="yes">Enter the File name.
 The extension will be added according to the type.</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label1">
+                          <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Name:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label12349">
+                          <object class="GtkLabel" id="label12349">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Type:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="new.file.entry">
+                          <object class="GtkEntry" id="new.file.entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <signal name="changed" handler="on_new_file_entry_changed"/>
-                          </widget>
+                            <signal handler="on_new_file_entry_changed" name="changed"/>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="new.file.type">
+                          <object class="GtkComboBox" id="new.file.type">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-			    <property name="items" translatable="no"></property>
-                            <signal name="changed" handler="on_new_file_type_changed"/>
-                          </widget>
+                            <signal handler="on_new_file_type_changed" name="changed"/>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox1125">
+              <object class="GtkVBox" id="vbox1125">
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label12342">
+                  <object class="GtkLabel" id="label12342">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox1126">
+                  <object class="GtkHBox" id="hbox1126">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label12343">
+                      <object class="GtkLabel" id="label12343">
                         <property name="visible">True</property>
                         <property name="xpad">4</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkTable" id="table32">
+                      <object class="GtkTable" id="table32">
                         <property name="visible">True</property>
                         <property name="n_rows">5</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkCheckButton" id="new.file.license">
+                          <object class="GtkCheckButton" id="new.file.license">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Add License Information</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_new_file_license_toggled"/>
-                          </widget>
+                            <signal handler="on_new_file_license_toggled" name="toggled"/>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label12344">
+                          <object class="GtkLabel" id="label12344">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">License:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="new.file.menu.license">
+                          <object class="GtkComboBox" id="new.file.menu.license">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="items" translatable="no"></property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="new.file.header">
+                          <object class="GtkCheckButton" id="new.file.header">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Create corresponding header file</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="new.file.template">
+                          <object class="GtkCheckButton" id="new.file.template">
                             <property name="visible">True</property>
                             <property name="sensitive">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Use Template for the Header file</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox1129">
+                          <object class="GtkHBox" id="hbox1129">
                             <property name="visible">True</property>
                             <property name="border_width">2</property>
                             <property name="homogeneous">True</property>
                             <child>
-                              <widget class="GtkCheckButton" id="add_to_project">
+                              <object class="GtkCheckButton" id="add_to_project">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="label" translatable="yes">Add to project</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>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="add_to_repository">
+                              <object class="GtkCheckButton" id="add_to_repository">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="label" translatable="yes">Add to repository</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">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
@@ -285,62 +277,64 @@ The extension will be added according to the type.</property>
                             <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</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_END</property>
             <child>
-              <widget class="GtkButton" id="cancelbutton1">
+              <object class="GtkButton" id="cancelbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-                <signal name="clicked" handler="on_new_file_cancelbutton_clicked"/>
-              </widget>
+                <signal handler="on_new_file_cancelbutton_clicked" name="clicked"/>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton1">
+              <object class="GtkButton" id="okbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-                <signal name="clicked" handler="on_new_file_okbutton_clicked"/>
-              </widget>
+                <signal handler="on_new_file_okbutton_clicked" name="clicked"/>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/file-wizard/file.c b/plugins/file-wizard/file.c
index 1ca5ec1..9597e58 100644
--- a/plugins/file-wizard/file.c
+++ b/plugins/file-wizard/file.c
@@ -42,7 +42,7 @@
 #include "plugin.h"
 #include "file.h"
 
-#define GLADE_FILE_FILE PACKAGE_DATA_DIR"/glade/anjuta-file-wizard.glade"
+#define BUILDER_FILE_FILE PACKAGE_DATA_DIR"/glade/anjuta-file-wizard.glade"
 #define NEW_FILE_DIALOG "dialog.new.file"
 #define NEW_FILE_ENTRY "new.file.entry"
 #define NEW_FILE_TYPE "new.file.type"
@@ -55,7 +55,7 @@
 
 typedef struct _NewFileGUI
 {
-	GladeXML *xml;
+	GtkBuilder *bxml;
 	GtkWidget *dialog;
 	GtkWidget *add_to_project;
 	GtkWidget *add_to_repository;
@@ -173,26 +173,27 @@ create_new_file_dialog(IAnjutaDocumentManager *docman)
 	gint i;
 
 	nfg = g_new0(NewFileGUI, 1);
-	if (NULL == (nfg->xml = glade_xml_new(GLADE_FILE_FILE, NEW_FILE_DIALOG, NULL)))	
+	nfg->bxml =  gtk_builder_new ();
+	if (!gtk_builder_add_from_file (nfg->bxml, BUILDER_FILE_FILE, NULL))
 	{
 		anjuta_util_dialog_error(NULL, _("Unable to build user interface for New File"));
 		g_free(nfg);
 		nfg = NULL;
 		return FALSE;
 	}
-	nfg->dialog = glade_xml_get_widget(nfg->xml, NEW_FILE_DIALOG);
-	nfg->add_to_project = glade_xml_get_widget (nfg->xml, NEW_FILE_ADD_TO_PROJECT);
-	nfg->add_to_repository = glade_xml_get_widget (nfg->xml, NEW_FILE_ADD_TO_REPOSITORY);
+	nfg->dialog = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_DIALOG));
+	nfg->add_to_project = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ADD_TO_PROJECT));
+	nfg->add_to_repository = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ADD_TO_REPOSITORY));
 	nfg->showing = FALSE;
 	
-	optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_TYPE);
+	optionmenu = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_TYPE));
 	for (i=0; i < (sizeof(new_file_type) / sizeof(NewfileType)); i++)
 	{
 		gtk_combo_box_append_text (GTK_COMBO_BOX (optionmenu), new_file_type[i].name);
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 0);
 
-	optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_MENU_LICENSE);
+	optionmenu = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_MENU_LICENSE));
 	for (i=0; i < (sizeof(new_license_type) / sizeof(NewlicenseType)); i++)
 	{
 		gtk_combo_box_append_text (GTK_COMBO_BOX (optionmenu), new_license_type[i].name);
@@ -200,7 +201,7 @@ create_new_file_dialog(IAnjutaDocumentManager *docman)
 	gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 0);
 	
 	g_object_set_data (G_OBJECT (nfg->dialog), "IAnjutaDocumentManager", docman);
-	glade_xml_signal_autoconnect(nfg->xml);
+	gtk_builder_connect_signals (nfg->bxml, NULL);
 	g_signal_emit_by_name(G_OBJECT (optionmenu), "changed");
 	
 	return TRUE;
@@ -243,7 +244,7 @@ on_new_file_okbutton_clicked(GtkWidget *window, GdkEvent *event,
 										"IAnjutaDocumentManager"));
 	macro = anjuta_shell_get_interface (ANJUTA_PLUGIN(docman)->shell, 
 		                       IAnjutaMacro, NULL);
-	entry = glade_xml_get_widget(nfg->xml, NEW_FILE_ENTRY);
+	entry = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ENTRY));
 	name = gtk_entry_get_text(GTK_ENTRY(entry));
 
 	/* Create main file */
@@ -256,10 +257,10 @@ on_new_file_okbutton_clicked(GtkWidget *window, GdkEvent *event,
 		return FALSE;
 	
 	/* Create header file */
-	optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_TYPE);
+	optionmenu = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_TYPE));
 	source_type = gtk_combo_box_get_active(GTK_COMBO_BOX(optionmenu));
 	
-	checkbutton = glade_xml_get_widget(nfg->xml, NEW_FILE_HEADER);
+	checkbutton = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_HEADER));
 	if (GTK_WIDGET_SENSITIVE(checkbutton) && 
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)))
 	{
@@ -286,7 +287,7 @@ on_new_file_okbutton_clicked(GtkWidget *window, GdkEvent *event,
 		ianjuta_document_manager_set_current_document (docman, IANJUTA_DOCUMENT(te), NULL);		
 	}
 
-	checkbutton = glade_xml_get_widget(nfg->xml, NEW_FILE_TEMPLATE);
+	checkbutton = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_TEMPLATE));
 	if (GTK_WIDGET_SENSITIVE(checkbutton) && 
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)))
 	{
@@ -299,11 +300,11 @@ on_new_file_okbutton_clicked(GtkWidget *window, GdkEvent *event,
 		}
 	}
 	
-	checkbutton = glade_xml_get_widget(nfg->xml, NEW_FILE_LICENSE);
+	checkbutton = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_LICENSE));
 	if (GTK_WIDGET_SENSITIVE(checkbutton) && 
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)))
 	{
-		optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_MENU_LICENSE);
+		optionmenu = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_MENU_LICENSE));
 		sel = gtk_combo_box_get_active(GTK_COMBO_BOX(optionmenu));
 		license_type = new_license_type[sel].type;
 		comment_type = new_file_type[source_type].comment;
@@ -400,7 +401,7 @@ on_new_file_entry_changed (GtkEditable *entry, gpointer user_data)
 	
 	if (last_length != 2 && length == 1)
 	{
-		optionmenu = glade_xml_get_widget(nfg->xml, NEW_FILE_TYPE);
+		optionmenu = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_TYPE));
 		sel = gtk_combo_box_get_active(GTK_COMBO_BOX(optionmenu));
 		name = g_strconcat (name, new_file_type[sel].ext, NULL);
 		gtk_entry_set_text (GTK_ENTRY(entry), name);
@@ -420,15 +421,15 @@ on_new_file_type_changed (GtkComboBox   *optionmenu, gpointer user_data)
 	
 	sel = gtk_combo_box_get_active(optionmenu);
 	
-	widget = glade_xml_get_widget(nfg->xml, NEW_FILE_HEADER);
+	widget = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_HEADER));
 	gtk_widget_set_sensitive(widget, new_file_type[sel].header >= 0);
-	widget = glade_xml_get_widget(nfg->xml, NEW_FILE_LICENSE);
+	widget = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_LICENSE));
 	gtk_widget_set_sensitive(widget, new_file_type[sel].gpl);
-	widget = glade_xml_get_widget(nfg->xml, NEW_FILE_TEMPLATE);
+	widget = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_TEMPLATE));
 	gtk_widget_set_sensitive(widget, new_file_type[sel].template);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), FALSE);
 	
-	entry = glade_xml_get_widget(nfg->xml, NEW_FILE_ENTRY);
+	entry = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_ENTRY));
 	name = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
 	if (strlen(name) > 0)
 	{
@@ -446,7 +447,7 @@ on_new_file_license_toggled(GtkToggleButton *button, gpointer user_data)
 {
 	GtkWidget *widget;
 	
-	widget = glade_xml_get_widget(nfg->xml, NEW_FILE_MENU_LICENSE);
+	widget = GTK_WIDGET (gtk_builder_get_object (nfg->bxml, NEW_FILE_MENU_LICENSE));
 	gtk_widget_set_sensitive(widget, gtk_toggle_button_get_active(button));
 }
 
diff --git a/plugins/gbf-am/gbf-am-dialogs.glade b/plugins/gbf-am/gbf-am-dialogs.glade
index f067351..57256dd 100644
--- a/plugins/gbf-am/gbf-am-dialogs.glade
+++ b/plugins/gbf-am/gbf-am-dialogs.glade
@@ -1,571 +1,521 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="project_properties_dialog">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-
-  <child>
-    <widget class="GtkNotebook" id="top_level">
-      <property name="border_width">5</property>
-      <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="show_tabs">True</property>
-      <property name="show_border">True</property>
-      <property name="tab_pos">GTK_POS_TOP</property>
-      <property name="scrollable">False</property>
-      <property name="enable_popup">False</property>
-
-      <child>
-	<widget class="GtkTable" id="general_properties_table">
-	  <property name="visible">True</property>
-	  <property name="n_rows">7</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">0</property>
-	  <property name="column_spacing">0</property>
-	</widget>
-	<packing>
-	  <property name="tab_expand">False</property>
-	  <property name="tab_fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label1">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">General</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	  <property name="width_chars">-1</property>
-	  <property name="single_line_mode">False</property>
-	  <property name="angle">0</property>
-	</widget>
-	<packing>
-	  <property name="type">tab</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox1">
-	  <property name="height_request">300</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox1">
-	      <property name="border_width">5</property>
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">5</property>
-
-	      <child>
-		<widget class="GtkButton" id="add_module_button">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox1">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-add</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Add _module</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="add_package_button">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment2">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox2">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image2">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-add</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label4">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Add _Package</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="remove_button">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-remove</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-	      <property name="border_width">5</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_ETCHED_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="packages_treeview">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		  <property name="fixed_height_mode">False</property>
-		  <property name="hover_selection">False</property>
-		  <property name="hover_expand">False</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="tab_expand">False</property>
-	  <property name="tab_fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label2">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">Packages</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	  <property name="width_chars">-1</property>
-	  <property name="single_line_mode">False</property>
-	  <property name="angle">0</property>
-	</widget>
-	<packing>
-	  <property name="type">tab</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox3">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox2">
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">5</property>
-
-	      <child>
-		<widget class="GtkButton" id="add_variable_button">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-add</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="remove_variable_button">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-remove</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-	      <property name="border_width">5</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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="variables_treeview">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		  <property name="fixed_height_mode">False</property>
-		  <property name="hover_selection">False</property>
-		  <property name="hover_expand">False</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="tab_expand">False</property>
-	  <property name="tab_fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label6">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">Variables</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	  <property name="width_chars">-1</property>
-	  <property name="single_line_mode">False</property>
-	  <property name="angle">0</property>
-	</widget>
-	<packing>
-	  <property name="type">tab</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="package_selection_dialog">
-  <property name="title" translatable="yes">Select package</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">600</property>
-  <property name="default_height">500</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-add</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-3</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox2">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame1">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment3">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow2">
-		      <property name="border_width">5</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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="pkg_treeview">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">False</property>
-			  <property name="reorderable">False</property>
-			  <property name="enable_search">True</property>
-			  <property name="fixed_height_mode">False</property>
-			  <property name="hover_selection">False</property>
-			  <property name="hover_expand">False</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label5">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Select Package to add:&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkWindow" id="project_properties_dialog">
+    <property name="title" translatable="yes">window1</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <child>
+      <object class="GtkNotebook" id="top_level">
+        <property name="border_width">5</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="show_tabs">True</property>
+        <property name="show_border">True</property>
+        <property name="tab_pos">GTK_POS_TOP</property>
+        <property name="scrollable">False</property>
+        <property name="enable_popup">False</property>
+        <child>
+          <object class="GtkTable" id="general_properties_table">
+            <property name="visible">True</property>
+            <property name="n_rows">7</property>
+            <property name="n_columns">2</property>
+            <property name="homogeneous">False</property>
+            <property name="row_spacing">0</property>
+            <property name="column_spacing">0</property>
+          </object>
+          <packing>
+            <property name="tab_expand">False</property>
+            <property name="tab_fill">True</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">General</property>
+            <property name="use_underline">False</property>
+            <property name="use_markup">False</property>
+            <property name="justify">GTK_JUSTIFY_LEFT</property>
+            <property name="wrap">False</property>
+            <property name="selectable">False</property>
+            <property name="xalign">0.5</property>
+            <property name="yalign">0.5</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+            <property name="width_chars">-1</property>
+            <property name="single_line_mode">False</property>
+            <property name="angle">0</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="height_request">300</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkHButtonBox" id="hbuttonbox1">
+                <property name="border_width">5</property>
+                <property name="visible">True</property>
+                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkButton" id="add_module_button">
+                    <property name="visible">True</property>
+                    <property name="can_default">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                    <property name="focus_on_click">True</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
+                        <property name="top_padding">0</property>
+                        <property name="bottom_padding">0</property>
+                        <property name="left_padding">0</property>
+                        <property name="right_padding">0</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <object class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-add</property>
+                                <property name="icon_size">4</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label3">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Add _module</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" id="add_package_button">
+                    <property name="visible">True</property>
+                    <property name="can_default">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                    <property name="focus_on_click">True</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
+                        <property name="top_padding">0</property>
+                        <property name="bottom_padding">0</property>
+                        <property name="left_padding">0</property>
+                        <property name="right_padding">0</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox2">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <object class="GtkImage" id="image2">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-add</property>
+                                <property name="icon_size">4</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label4">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Add _Package</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" id="remove_button">
+                    <property name="visible">True</property>
+                    <property name="can_default">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-remove</property>
+                    <property name="use_stock">True</property>
+                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                    <property name="focus_on_click">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="border_width">5</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_ETCHED_IN</property>
+                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                <child>
+                  <object class="GtkTreeView" id="packages_treeview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">True</property>
+                    <property name="rules_hint">False</property>
+                    <property name="reorderable">False</property>
+                    <property name="enable_search">True</property>
+                    <property name="fixed_height_mode">False</property>
+                    <property name="hover_selection">False</property>
+                    <property name="hover_expand">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="tab_expand">False</property>
+            <property name="tab_fill">True</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Packages</property>
+            <property name="use_underline">False</property>
+            <property name="use_markup">False</property>
+            <property name="justify">GTK_JUSTIFY_LEFT</property>
+            <property name="wrap">False</property>
+            <property name="selectable">False</property>
+            <property name="xalign">0.5</property>
+            <property name="yalign">0.5</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+            <property name="width_chars">-1</property>
+            <property name="single_line_mode">False</property>
+            <property name="angle">0</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox3">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkHButtonBox" id="hbuttonbox2">
+                <property name="visible">True</property>
+                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkButton" id="add_variable_button">
+                    <property name="visible">True</property>
+                    <property name="can_default">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-add</property>
+                    <property name="use_stock">True</property>
+                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                    <property name="focus_on_click">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" id="remove_variable_button">
+                    <property name="visible">True</property>
+                    <property name="can_default">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-remove</property>
+                    <property name="use_stock">True</property>
+                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                    <property name="focus_on_click">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow3">
+                <property name="border_width">5</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="window_placement">GTK_CORNER_TOP_LEFT</property>
+                <child>
+                  <object class="GtkTreeView" id="variables_treeview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">True</property>
+                    <property name="rules_hint">False</property>
+                    <property name="reorderable">False</property>
+                    <property name="enable_search">True</property>
+                    <property name="fixed_height_mode">False</property>
+                    <property name="hover_selection">False</property>
+                    <property name="hover_expand">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="tab_expand">False</property>
+            <property name="tab_fill">True</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label6">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Variables</property>
+            <property name="use_underline">False</property>
+            <property name="use_markup">False</property>
+            <property name="justify">GTK_JUSTIFY_LEFT</property>
+            <property name="wrap">False</property>
+            <property name="selectable">False</property>
+            <property name="xalign">0.5</property>
+            <property name="yalign">0.5</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+            <property name="width_chars">-1</property>
+            <property name="single_line_mode">False</property>
+            <property name="angle">0</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="package_selection_dialog">
+    <property name="title" translatable="yes">Select package</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="modal">False</property>
+    <property name="default_width">600</property>
+    <property name="default_height">500</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="has_separator">True</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="cancelbutton1">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="okbutton1">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-add</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="label_yalign">0.5</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment3">
+                    <property name="visible">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xscale">1</property>
+                    <property name="yscale">1</property>
+                    <property name="top_padding">0</property>
+                    <property name="bottom_padding">0</property>
+                    <property name="left_padding">12</property>
+                    <property name="right_padding">0</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow2">
+                        <property name="border_width">5</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="window_placement">GTK_CORNER_TOP_LEFT</property>
+                        <child>
+                          <object class="GtkTreeView" id="pkg_treeview">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="headers_visible">True</property>
+                            <property name="rules_hint">False</property>
+                            <property name="reorderable">False</property>
+                            <property name="enable_search">True</property>
+                            <property name="fixed_height_mode">False</property>
+                            <property name="hover_selection">False</property>
+                            <property name="hover_expand">False</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Select Package to add:&lt;/b&gt;</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-3">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/gbf-am/gbf-am-properties.c b/plugins/gbf-am/gbf-am-properties.c
index feaf937..1cd8247 100644
--- a/plugins/gbf-am/gbf-am-properties.c
+++ b/plugins/gbf-am/gbf-am-properties.c
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade-xml.h>
 
 #include <glib/gi18n.h>
 
@@ -407,7 +406,7 @@ add_package_module_clicked_cb (GtkWidget *button, GbfAmProject *project)
 static void
 add_package_clicked_cb (GtkWidget *button, GbfAmProject *project)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkTreeView *treeview;
 	GtkTreeSelection *selection;
 	GtkTreeIter iter, parent;
@@ -420,12 +419,17 @@ add_package_clicked_cb (GtkWidget *button, GbfAmProject *project)
 	GtkTreeViewColumn *col;
 	gchar *pkg_to_add = NULL;
 	GbfAmConfigMapping *config;
+	GError* error = NULL;
 	
 	/* Let user select a package */
-	gxml = glade_xml_new (GLADE_FILE, "package_selection_dialog",
-			      GETTEXT_PACKAGE);
-	dlg = glade_xml_get_widget (gxml, "package_selection_dialog");
-	pkg_treeview = glade_xml_get_widget (gxml, "pkg_treeview");
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	dlg = GTK_WIDGET (gtk_builder_get_object (bxml, "package_selection_dialog"));
+	pkg_treeview = GTK_WIDGET (gtk_builder_get_object (bxml, "pkg_treeview"));
 	renderer = gtk_cell_renderer_text_new ();
 	col = gtk_tree_view_column_new_with_attributes (_("Module/Packages"),
 							renderer,
@@ -771,7 +775,7 @@ on_project_widget_destroy (GtkWidget *wid, GtkWidget *top_level)
 GtkWidget*
 gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GbfAmConfigMapping *config;
 	GbfAmConfigValue *value;
 	GtkWidget *top_level;
@@ -799,10 +803,13 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 		g_propagate_error (error, err);
 		return NULL;
 	}
-	
-	gxml = glade_xml_new (GLADE_FILE, "project_properties_dialog",
-			      GETTEXT_PACKAGE);
-	top_level = glade_xml_get_widget (gxml, "top_level");
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &err))
+	{
+		g_warning ("Couldn't load builder file: %s", err->message);
+		g_error_free (err);
+	}
+	top_level = GTK_WIDGET (gtk_builder_get_object (bxml, "top_level"));
         
 	g_object_set_data (G_OBJECT (top_level), "__project", project);
 	g_object_set_data_full (G_OBJECT (top_level), "__config", config,
@@ -811,15 +818,15 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 			  G_CALLBACK (on_project_widget_destroy), top_level);
 	g_object_ref (top_level);
         
-	add_module_button = glade_xml_get_widget (gxml, "add_module_button");
+	add_module_button = GTK_WIDGET (gtk_builder_get_object (bxml, "add_module_button"));
 	g_object_set_data (G_OBJECT (project), "__add_module_button",
 			   add_module_button);
 	
-	add_package_button = glade_xml_get_widget (gxml, "add_package_button");
+	add_package_button = GTK_WIDGET (gtk_builder_get_object (bxml, "add_package_button"));
 	g_object_set_data (G_OBJECT (project), "__add_package_button",
 			   add_package_button);
 	
-	remove_button = glade_xml_get_widget (gxml, "remove_button");
+	remove_button = GTK_WIDGET (gtk_builder_get_object (bxml, "remove_button"));
 	g_object_set_data (G_OBJECT (project), "__remove_button",
 			   remove_button);
 	
@@ -827,7 +834,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 	gtk_widget_set_sensitive (add_package_button, FALSE);
 	gtk_widget_set_sensitive (remove_button, FALSE);
 	
-	table = glade_xml_get_widget (gxml, "general_properties_table");
+	table = GTK_WIDGET (gtk_builder_get_object (bxml, "general_properties_table"));
 	
 	g_object_ref (top_level);
 	gtk_container_remove (GTK_CONTAINER(top_level->parent), top_level);
@@ -909,7 +916,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 		g_strfreev (modules);
 	}
 	
-	treeview = glade_xml_get_widget (gxml, "packages_treeview");
+	treeview = GTK_WIDGET (gtk_builder_get_object (bxml, "packages_treeview"));
 	
 	g_object_set_data (G_OBJECT (project), "__packages_treeview", treeview);
 	g_object_set_data (G_OBJECT (project), "__config", config);
@@ -952,7 +959,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 					       variables_store);
 	}
 	
-	treeview = glade_xml_get_widget (gxml, "variables_treeview");
+	treeview = GTK_WIDGET (gtk_builder_get_object (bxml, "variables_treeview"));
 	g_object_set_data (G_OBJECT (project), "__variables_treeview",
 			   treeview);
 	gtk_tree_view_set_model (GTK_TREE_VIEW(treeview),
@@ -983,11 +990,11 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 			  G_CALLBACK (variables_treeview_selection_changed_cb),
 			  project);
 
-	add_variable_button = glade_xml_get_widget (gxml, "add_variable_button");
+	add_variable_button = GTK_WIDGET (gtk_builder_get_object (bxml, "add_variable_button"));
 	g_object_set_data (G_OBJECT (project), "__add_variable_button",
 			   add_variable_button);
 	
-	remove_variable_button = glade_xml_get_widget (gxml, "remove_variable_button");
+	remove_variable_button = GTK_WIDGET (gtk_builder_get_object (bxml, "remove_variable_button"));
 	g_object_set_data (G_OBJECT (project), "__remove_variable_button",
 			   remove_variable_button);
 	gtk_widget_set_sensitive (add_variable_button, TRUE);
@@ -1004,7 +1011,7 @@ gbf_am_properties_get_widget (GbfAmProject *project, GError **error)
 	
 	g_object_unref (variables_store);
 	g_object_unref (store);
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 	return top_level;
 }
 
diff --git a/plugins/language-support-cpp-java/anjuta-language-cpp-java.glade b/plugins/language-support-cpp-java/anjuta-language-cpp-java.glade
index 8bfb04d..04d03a6 100644
--- a/plugins/language-support-cpp-java/anjuta-language-cpp-java.glade
+++ b/plugins/language-support-cpp-java/anjuta-language-cpp-java.glade
@@ -1,25 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="preferences_dialog">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">4</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">50</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">10</property>
+  </object>
+  <object class="GtkWindow" id="preferences_dialog">
     <property name="title" translatable="yes">window1</property>
     <child>
-      <widget class="GtkNotebook" id="preferences">
+      <object class="GtkNotebook" id="preferences">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child>
-          <widget class="GtkFrame" id="page2">
+          <object class="GtkFrame" id="page2">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkVBox" id="vbox1111">
+              <object class="GtkVBox" id="vbox1111">
                 <property name="visible">True</property>
                 <property name="spacing">5</property>
                 <child>
-                  <widget class="GtkTable" id="table15">
+                  <object class="GtkTable" id="table15">
                     <property name="visible">True</property>
                     <property name="border_width">10</property>
                     <property name="n_rows">3</property>
@@ -27,235 +50,224 @@
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.automatic">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.automatic">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Enable smart indentation</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.adaptive">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.adaptive">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Enable adaptive indentation</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.tab.indents">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.tab.indents">
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Pressing tab indents</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame48">
+                  <object class="GtkFrame" id="frame48">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment5">
+                      <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table18">
+                          <object class="GtkTable" id="table18">
                             <property name="visible">True</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkSpinButton" id="preferences_spin:int:0:1:language.cpp.indent.brace.size">
+                              <object class="GtkSpinButton" id="preferences_spin:int:0:1:language.cpp.indent.brace.size">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">0 0 100 1 10 0</property>
+                                <property name="adjustment">adjustment1</property>
                                 <property name="climb_rate">1</property>
                                 <property name="numeric">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkSpinButton" id="preferences_spin:int:4:1:language.cpp.indent.statement.size">
+                              <object class="GtkSpinButton" id="preferences_spin:int:4:1:language.cpp.indent.statement.size">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">4 0 100 1 10 0</property>
+                                <property name="adjustment">adjustment2</property>
                                 <property name="climb_rate">1</property>
                                 <property name="numeric">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label12353">
+                              <object class="GtkLabel" id="label12353">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Brace indentation size in spaces:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label123">
+                              <object class="GtkLabel" id="label123">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Statement indentation size in spaces:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label12355">
+                    <child type="label">
+                      <object class="GtkLabel" id="label12355">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Indentation parameters&lt;/b&gt;</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>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label12321">
+            <child type="label">
+              <object class="GtkLabel" id="label12321">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;Smart Indentation&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
+              </object>
             </child>
-          </widget>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="label12351">
+        <child type="tab">
+          <object class="GtkLabel" id="label12351">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Smart Indentation</property>
-          </widget>
+          </object>
           <packing>
-            <property name="type">tab</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <widget class="GtkFrame" id="frame45">
+              <object class="GtkFrame" id="frame45">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
                 <property name="label_yalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox1118">
+                  <object class="GtkVBox" id="vbox1118">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1122">
+                      <object class="GtkHBox" id="hbox1122">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkSpinButton" id="preferences_spin:int:10:0:language.cpp.code.completion.choices">
+                          <object class="GtkSpinButton" id="preferences_spin:int:10:0:language.cpp.code.completion.choices">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">10 0 50 1 10 0</property>
+                            <property name="adjustment">adjustment3</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label1295">
+                          <object class="GtkLabel" id="label1295">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                             <property name="label" translatable="yes">Autocompletion pop up choices</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>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.enable">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.enable">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="border_width">5</property>
                         <property name="label" translatable="yes">Enable code completion</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>
@@ -263,69 +275,63 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.space.after.func">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.space.after.func">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="border_width">5</property>
                         <property name="label" translatable="yes">Add a space after function call autocompletion</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.brace.after.func">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.brace.after.func">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="border_width">5</property>
                         <property name="label" translatable="yes">Add '(' after function call autocompletion</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:language.cpp.brace.autocompletion">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:language.cpp.brace.autocompletion">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="border_width">5</property>
                         <property name="label" translatable="yes">Enable smart brace completion</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">4</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label12334">
+                <child type="label">
+                  <object class="GtkLabel" id="label12334">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
                     <property name="label" translatable="yes">&lt;b&gt;Autocompletion (C/C++/Java only)&lt;/b&gt;</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>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame1">
+              <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="border_width">5</property>
@@ -333,68 +339,60 @@
                 <property name="label_yalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.calltip.enable">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.calltip.enable">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="border_width">5</property>
                             <property name="label" translatable="yes">Show calltips</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>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label2">
+                <child type="label">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Calltips&lt;/b&gt;</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">1</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="label1">
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label" translatable="yes">Autocomplete</property>
-          </widget>
+          </object>
           <packing>
-            <property name="type">tab</property>
             <property name="position">1</property>
             <property name="tab_fill">False</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/language-support-cpp-java/plugin.c b/plugins/language-support-cpp-java/plugin.c
index 47455d4..3fbbcbe 100644
--- a/plugins/language-support-cpp-java/plugin.c
+++ b/plugins/language-support-cpp-java/plugin.c
@@ -50,7 +50,7 @@
 #define ANJUTA_STOCK_AUTOINDENT           "anjuta-indent"
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-language-support-cpp-java.ui"
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-language-cpp-java.glade"
+#define PREFS_BUILDER PACKAGE_DATA_DIR"/glade/anjuta-language-cpp-java.glade"
 #define ICON_FILE "anjuta-language-cpp-java-plugin.png"
 
 /* Preferences keys */
@@ -2037,14 +2037,19 @@ static void
 ipreferences_merge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs,
 					GError** e)
 {
-	GladeXML* gxml;
+	GError* error = NULL;
+	GtkBuilder* bxml = gtk_builder_new ();
 		
 	/* Add preferences */
-	gxml = glade_xml_new (PREFS_GLADE, "preferences_dialog", NULL);
-	anjuta_preferences_add_page (prefs,
-								 gxml, "preferences", _("C/C++/Java/Vala"),
+	if (!gtk_builder_add_from_file (bxml, PREFS_BUILDER, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+	anjuta_preferences_add_from_builder (prefs,
+								 bxml, "preferences", _("C/C++/Java/Vala"),
 								 ICON_FILE);
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 }
 
 static void
diff --git a/plugins/macro/Makefile.am b/plugins/macro/Makefile.am
index 16d20dc..9e0de86 100644
--- a/plugins/macro/Makefile.am
+++ b/plugins/macro/Makefile.am
@@ -29,7 +29,6 @@ plugin_LTLIBRARIES = libanjuta-macro.la
 libanjuta_macro_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_macro_la_LIBADD = \
-	$(GLADE_LIBS) \
 	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS)
 
diff --git a/plugins/macro/anjuta-macro.glade b/plugins/macro/anjuta-macro.glade
index 1d109fb..dd8285d 100644
--- a/plugins/macro/anjuta-macro.glade
+++ b/plugins/macro/anjuta-macro.glade
@@ -1,329 +1,313 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="macro_dialog_dummy">
+<interface>
+  <object class="GtkVBox" id="macro_dialog_table">
     <property name="visible">True</property>
-    <property name="title" translatable="yes">window1</property>
     <child>
-      <widget class="GtkVBox" id="macro_dialog_table">
+      <object class="GtkHPaned" id="hpaned1">
         <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="position">150</property>
         <child>
-          <widget class="GtkHPaned" id="hpaned1">
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="position">150</property>
+            <property name="border_width">3</property>
             <child>
-              <widget class="GtkVBox" id="vbox2">
+              <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
-                <property name="border_width">3</property>
-                <child>
-                  <widget class="GtkLabel" id="label10">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Macros:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="border_width">5</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>
-                    <child>
-                      <widget class="GtkTreeView" id="macro_tree">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="headers_visible">False</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkHButtonBox" id="hbuttonbox1">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </widget>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Macros:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
               <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox3">
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="border_width">5</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>
                 <child>
-                  <widget class="GtkLabel" id="label9">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Macro text:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                  <object class="GtkTreeView" id="macro_tree">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="border_width">5</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>
-                    <child>
-                      <widget class="GtkTextView" id="macro_preview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="editable">False</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label11">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Macro details:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="macro_details">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="wrap">True</property>
-                  </widget>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
+                    <property name="headers_visible">False</property>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkHButtonBox" id="hbuttonbox1">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="resize">False</property>
+            <property name="shrink">True</property>
+          </packing>
         </child>
         <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox2">
+          <object class="GtkVBox" id="vbox3">
             <property name="visible">True</property>
             <property name="border_width">5</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">GTK_BUTTONBOX_START</property>
             <child>
-              <widget class="GtkButton" id="macro_add">
+              <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-add</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_add_clicked"/>
-              </widget>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Macro text:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="macro_edit">
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label" translatable="yes">Edit...</property>
-                <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_edit_clicked"/>
-              </widget>
+                <property name="border_width">5</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>
+                <child>
+                  <object class="GtkTextView" id="macro_preview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                  </object>
+                </child>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="macro_remove">
+              <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-remove</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_remove_clicked"/>
-              </widget>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Macro details:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkLabel" id="macro_details">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="macro_edit_dummy">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">window2</property>
     <child>
-      <widget class="GtkTable" id="macro_edit_table">
+      <object class="GtkHButtonBox" id="hbuttonbox2">
         <property name="visible">True</property>
-        <property name="border_width">10</property>
-        <property name="n_rows">6</property>
-        <property name="n_columns">2</property>
-        <property name="column_spacing">5</property>
-        <property name="row_spacing">5</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <property name="layout_style">GTK_BUTTONBOX_START</property>
         <child>
-          <placeholder/>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="macro_shortcut">
+          <object class="GtkButton" id="macro_add">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="max_length">1</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Macro details:&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </widget>
-          <packing>
-            <property name="right_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">5</property>
-            <property name="label" translatable="yes">Name:</property>
-          </widget>
-          <packing>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
+            <property name="can_default">True</property>
+            <property name="label">gtk-add</property>
+            <property name="use_stock">True</property>
+            <signal handler="on_add_clicked" name="clicked"/>
+          </object>
         </child>
         <child>
-          <widget class="GtkEntry" id="macro_name">
+          <object class="GtkButton" id="macro_edit">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
+            <property name="can_default">True</property>
+            <property name="label" translatable="yes">Edit...</property>
+            <property name="use_underline">True</property>
+            <signal handler="on_edit_clicked" name="clicked"/>
+          </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label8">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Macro text:&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </widget>
-          <packing>
-            <property name="right_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow3">
+          <object class="GtkButton" id="macro_remove">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="border_width">5</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>
-            <child>
-              <widget class="GtkTextView" id="macro_text">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </widget>
-            </child>
-          </widget>
+            <property name="can_default">True</property>
+            <property name="label">gtk-remove</property>
+            <property name="use_stock">True</property>
+            <signal handler="on_remove_clicked" name="clicked"/>
+          </object>
           <packing>
-            <property name="right_attach">2</property>
-            <property name="top_attach">5</property>
-            <property name="bottom_attach">6</property>
-            <property name="x_options">GTK_FILL</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">5</property>
-            <property name="label" translatable="yes">Shortcut:</property>
-          </widget>
-          <packing>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="position">2</property>
           </packing>
         </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkTable" id="macro_edit_table">
+    <property name="visible">True</property>
+    <property name="border_width">10</property>
+    <property name="n_rows">6</property>
+    <property name="n_columns">2</property>
+    <property name="column_spacing">5</property>
+    <property name="row_spacing">5</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkEntry" id="macro_shortcut">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="max_length">1</property>
+        <property name="invisible_char">*</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">3</property>
+        <property name="bottom_attach">4</property>
+        <property name="y_options"/>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label12">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">&lt;b&gt;Macro details:&lt;/b&gt;</property>
+        <property name="use_markup">True</property>
+      </object>
+      <packing>
+        <property name="right_attach">2</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options"/>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label4">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="xpad">5</property>
+        <property name="label" translatable="yes">Name:</property>
+      </object>
+      <packing>
+        <property name="top_attach">1</property>
+        <property name="bottom_attach">2</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options"/>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="macro_name">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="invisible_char">*</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">1</property>
+        <property name="bottom_attach">2</property>
+        <property name="y_options"/>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label8">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">&lt;b&gt;Macro text:&lt;/b&gt;</property>
+        <property name="use_markup">True</property>
+      </object>
+      <packing>
+        <property name="right_attach">2</property>
+        <property name="top_attach">4</property>
+        <property name="bottom_attach">5</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options"/>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolledwindow3">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="border_width">5</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>
         <child>
-          <widget class="GtkLabel" id="label6">
+          <object class="GtkTextView" id="macro_text">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">5</property>
-            <property name="label" translatable="yes">Category:</property>
-          </widget>
-          <packing>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
+            <property name="can_focus">True</property>
+          </object>
         </child>
-      </widget>
+      </object>
+      <packing>
+        <property name="right_attach">2</property>
+        <property name="top_attach">5</property>
+        <property name="bottom_attach">6</property>
+        <property name="x_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label7">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="xpad">5</property>
+        <property name="label" translatable="yes">Shortcut:</property>
+      </object>
+      <packing>
+        <property name="top_attach">3</property>
+        <property name="bottom_attach">4</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options"/>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label6">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="xpad">5</property>
+        <property name="label" translatable="yes">Category:</property>
+      </object>
+      <packing>
+        <property name="top_attach">2</property>
+        <property name="bottom_attach">3</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options"/>
+      </packing>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/macro/macro-actions.h b/plugins/macro/macro-actions.h
index a295f15..05a1ad9 100644
--- a/plugins/macro/macro-actions.h
+++ b/plugins/macro/macro-actions.h
@@ -19,7 +19,6 @@
 #define MACRO_ACTIONS_H
 
 #include "plugin.h"
-#include <glade/glade.h>
 
 void on_menu_insert_macro (GtkAction * action, MacroPlugin * plugin);
 void on_menu_add_macro (GtkAction * action, MacroPlugin * plugin);
diff --git a/plugins/macro/macro-dialog.c b/plugins/macro/macro-dialog.c
index f93a4d3..63ffee8 100644
--- a/plugins/macro/macro-dialog.c
+++ b/plugins/macro/macro-dialog.c
@@ -20,6 +20,10 @@
 #include "macro-actions.h"
 #include <libanjuta/interfaces/ianjuta-editor.h>
 
+void on_add_clicked (GtkButton * add, MacroDialog * dialog);
+void on_remove_clicked (GtkButton * remove, MacroDialog * dialog);
+void on_edit_clicked (GtkButton * ok, MacroDialog * dialog);
+
 enum
 {
 	OK,
@@ -115,8 +119,8 @@ on_macro_selection_changed (GtkTreeSelection * selection,
 		gtk_text_view_get_buffer (GTK_TEXT_VIEW
 					  (dialog->preview_text));
 
-	edit = glade_xml_get_widget (dialog->gxml, "macro_edit");
-	remove = glade_xml_get_widget (dialog->gxml, "macro_remove");
+	edit = GTK_WIDGET (gtk_builder_get_object (dialog->bxml, "macro_edit"));
+	remove = GTK_WIDGET (gtk_builder_get_object (dialog->bxml, "macro_remove"));
 
 	if (gtk_tree_selection_get_selected (selection, &model, &iter))
 	{
@@ -165,7 +169,7 @@ on_macro_selection_changed (GtkTreeSelection * selection,
 	gtk_widget_set_sensitive (remove, FALSE);
 }
 
-static void
+void
 on_add_clicked (GtkButton * add, MacroDialog * dialog)
 {
 	g_return_if_fail (dialog != NULL);
@@ -175,7 +179,7 @@ on_add_clicked (GtkButton * add, MacroDialog * dialog)
 	gtk_widget_show (GTK_WIDGET (edit));
 }
 
-static void
+void
 on_remove_clicked (GtkButton * remove, MacroDialog * dialog)
 {
 	GtkTreeSelection *selection = gtk_tree_view_get_selection
@@ -199,7 +203,7 @@ on_remove_clicked (GtkButton * remove, MacroDialog * dialog)
 	}
 }
 
-static void
+void
 on_edit_clicked (GtkButton * ok, MacroDialog * dialog)
 {
 	GtkTreeSelection *select = gtk_tree_view_get_selection
@@ -222,10 +226,10 @@ static void
 macro_dialog_dispose (GObject * object)
 {
 	MacroDialog *dialog = MACRO_DIALOG (object);
-	if (dialog->gxml)
+	if (dialog->bxml)
 	{
-		g_object_unref (dialog->gxml);
-		dialog->gxml = NULL;
+		g_object_unref (dialog->bxml);
+		dialog->bxml = NULL;
 	}
 	if (dialog->macro_db)
 	{
@@ -254,12 +258,20 @@ static void
 macro_dialog_init (MacroDialog * dialog)
 {
 	GtkTreeSelection *select;
-	dialog->gxml = glade_xml_new (GLADE_FILE, "macro_dialog_table", NULL);
-	GtkWidget *table =
-		glade_xml_get_widget (dialog->gxml, "macro_dialog_table");
+	GtkWidget *table;
+	GError* error = NULL;
 
 	g_return_if_fail (dialog != NULL);
 
+	dialog->bxml = gtk_builder_new ();
+	if (!gtk_builder_add_from_file (dialog->bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	table = GTK_WIDGET (gtk_builder_get_object (dialog->bxml, "macro_dialog_table"));
+
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("Insert"), OK,
 				GTK_STOCK_CANCEL, CANCEL, NULL);
@@ -267,19 +279,13 @@ macro_dialog_init (MacroDialog * dialog)
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Insert macro"));
 
 	dialog->macro_tree =
-		glade_xml_get_widget (dialog->gxml, "macro_tree");
+		GTK_WIDGET (gtk_builder_get_object (dialog->bxml, "macro_tree"));
 	dialog->preview_text =
-		glade_xml_get_widget (dialog->gxml, "macro_preview");
+		GTK_WIDGET (gtk_builder_get_object (dialog->bxml, "macro_preview"));
 	dialog->details_label =
-		glade_xml_get_widget (dialog->gxml, "macro_details");
-			
-	glade_xml_signal_connect_data (dialog->gxml, "on_edit_clicked",
-				       G_CALLBACK (on_edit_clicked), dialog);
-	glade_xml_signal_connect_data (dialog->gxml, "on_add_clicked",
-				       G_CALLBACK (on_add_clicked), dialog);
-	glade_xml_signal_connect_data (dialog->gxml, "on_remove_clicked",
-				       G_CALLBACK (on_remove_clicked),
-				       dialog);
+		GTK_WIDGET (gtk_builder_get_object (dialog->bxml, "macro_details"));
+
+	gtk_builder_connect_signals (dialog->bxml, dialog);
 
 	select = gtk_tree_view_get_selection (GTK_TREE_VIEW
 					      (dialog->macro_tree));
diff --git a/plugins/macro/macro-dialog.h b/plugins/macro/macro-dialog.h
index 9088dd9..6786b76 100644
--- a/plugins/macro/macro-dialog.h
+++ b/plugins/macro/macro-dialog.h
@@ -41,7 +41,7 @@ struct _MacroDialog
 
 	MacroDB *macro_db;
 	MacroPlugin *plugin;
-	GladeXML *gxml;
+	GtkBuilder *bxml;
 };
 
 struct _MacroDialogClass
diff --git a/plugins/macro/macro-edit.c b/plugins/macro/macro-edit.c
index 4738c96..c4146c9 100644
--- a/plugins/macro/macro-edit.c
+++ b/plugins/macro/macro-edit.c
@@ -192,10 +192,17 @@ static void
 macro_edit_init (MacroEdit * edit)
 {
 	GtkWidget *table;
+	GError* error = NULL;
 
-	edit->gxml = glade_xml_new (GLADE_FILE, "macro_edit_table", NULL);
+	edit->bxml = gtk_builder_new ();
 
-	table = glade_xml_get_widget (edit->gxml, "macro_edit_table");
+	if (!gtk_builder_add_from_file (edit->bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	table = GTK_WIDGET (gtk_builder_get_object (edit->bxml, "macro_edit_table"));
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (edit)->vbox), table);
 	gtk_dialog_add_buttons (GTK_DIALOG (edit), GTK_STOCK_OK, OK,
 				GTK_STOCK_CANCEL, CANCEL, NULL);
@@ -203,14 +210,14 @@ macro_edit_init (MacroEdit * edit)
 			  G_CALLBACK (on_dialog_response), edit);
 	gtk_window_set_title (GTK_WINDOW (edit), _("Add/Edit macro"));
 
-	edit->name_entry = glade_xml_get_widget (edit->gxml, "macro_name");
+	edit->name_entry = GTK_WIDGET (gtk_builder_get_object (edit->bxml, "macro_name"));
 	edit->category_entry = gtk_combo_box_entry_new_text ();
 	gtk_widget_show (edit->category_entry);
 	gtk_table_attach_defaults (GTK_TABLE (table),
 				   edit->category_entry, 1, 2, 2, 3);
 	edit->shortcut_entry =
-		glade_xml_get_widget (edit->gxml, "macro_shortcut");
-	edit->text = glade_xml_get_widget (edit->gxml, "macro_text");
+		GTK_WIDGET (gtk_builder_get_object (edit->bxml, "macro_shortcut"));
+	edit->text = GTK_WIDGET (gtk_builder_get_object (edit->bxml, "macro_text"));
 
 }
 
diff --git a/plugins/macro/macro-edit.h b/plugins/macro/macro-edit.h
index 07f3e91..59794c4 100644
--- a/plugins/macro/macro-edit.h
+++ b/plugins/macro/macro-edit.h
@@ -49,7 +49,7 @@ struct _MacroEdit
 	GtkWidget *text;
 
 	MacroDB *macro_db;
-	GladeXML *gxml;
+	GtkBuilder *bxml;
 	gint type;
 	GtkTreeSelection *select;
 };
diff --git a/plugins/message-view/anjuta-message-manager-plugin.glade b/plugins/message-view/anjuta-message-manager-plugin.glade
index 59b0831..41beaa4 100644
--- a/plugins/message-view/anjuta-message-manager-plugin.glade
+++ b/plugins/message-view/anjuta-message-manager-plugin.glade
@@ -1,20 +1,120 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="preferences_dialog_messages">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">1000</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">50</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">1000</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">50</property>
+  </object>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Top</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bottom</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Right</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Underline-Plain</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Underline-Squiggle</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Underline-TT</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Diagonal</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Strike-Out</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Underline-Plain</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Underline-Squiggle</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Underline-TT</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Diagonal</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Strike-Out</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Underline-Plain</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Underline-Squiggle</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Underline-TT</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Diagonal</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Strike-Out</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="preferences_dialog_messages">
     <property name="title" translatable="yes">window6</property>
     <child>
-      <widget class="GtkVBox" id="Messages">
+      <object class="GtkVBox" id="Messages">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkFrame" id="frame36">
+          <object class="GtkFrame" id="frame36">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkTable" id="table18">
+              <object class="GtkTable" id="table18">
                 <property name="visible">True</property>
                 <property name="border_width">10</property>
                 <property name="n_rows">4</property>
@@ -25,96 +125,98 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label138">
+                  <object class="GtkLabel" id="label138">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Tabs position:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkSpinButton" id="preferences_spin:int:50:0:truncat.mesg.first">
+                  <object class="GtkSpinButton" id="preferences_spin:int:50:0:truncat.mesg.first">
                     <property name="can_focus">True</property>
-                    <property name="adjustment">50 1 1000 1 10 0</property>
+                    <property name="adjustment">adjustment1</property>
                     <property name="climb_rate">1</property>
                     <property name="numeric">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkSpinButton" id="preferences_spin:int:50:0:truncat.mesg.last">
+                  <object class="GtkSpinButton" id="preferences_spin:int:50:0:truncat.mesg.last">
                     <property name="can_focus">True</property>
-                    <property name="adjustment">50 1 1000 1 10 0</property>
+                    <property name="adjustment">adjustment2</property>
                     <property name="climb_rate">1</property>
                     <property name="numeric">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label137">
+                  <object class="GtkLabel" id="label137">
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Number of last characters to show:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label136">
+                  <object class="GtkLabel" id="label136">
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Number of first characters to show:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:truncat.messages">
+                  <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:truncat.messages">
                     <property name="can_focus">True</property>
                     <property name="label" translatable="yes">Truncate long messages</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="preferences_combo:text:Top,Bottom,Left,Right:0:messages.tab.position">
+                  <object class="GtkComboBox" id="preferences_combo:text:Top,Bottom,Left,Right:0:messages.tab.position">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="items" translatable="yes">Top
-Bottom
-Left
-Right</property>
-                  </widget>
+                    <property name="model">model1</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -122,31 +224,28 @@ Right</property>
                     <property name="bottom_attach">4</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label135">
+            <child type="label">
+              <object class="GtkLabel" id="label135">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;Messages options&lt;/b&gt;</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>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame37">
+          <object class="GtkFrame" id="frame37">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkTable" id="table19">
+              <object class="GtkTable" id="table19">
                 <property name="visible">True</property>
                 <property name="border_width">10</property>
                 <property name="n_rows">3</property>
@@ -154,67 +253,71 @@ Right</property>
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label142">
+                  <object class="GtkLabel" id="label142">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Error message indicator style:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label141">
+                  <object class="GtkLabel" id="label141">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Warning message indicator style:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label140">
+                  <object class="GtkLabel" id="label140">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Normal message indicator style:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="preferences_combo:text:Underline-Plain,Underline-Squiggle,Underline-TT,Diagonal,Strike-Out:0:indicators.style.normal">
+                  <object class="GtkComboBox" id="preferences_combo:text:Underline-Plain,Underline-Squiggle,Underline-TT,Diagonal,Strike-Out:0:indicators.style.normal">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="items" translatable="yes">Underline-Plain
-Underline-Squiggle
-Underline-TT
-Diagonal
-Strike-Out</property>
-                  </widget>
+                    <property name="model">model2</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer2"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="preferences_combo:text:Underline-Plain,Underline-Squiggle,Underline-TT,Diagonal,Strike-Out:0:indicators.style.warning">
+                  <object class="GtkComboBox" id="preferences_combo:text:Underline-Plain,Underline-Squiggle,Underline-TT,Diagonal,Strike-Out:0:indicators.style.warning">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="items" translatable="yes">Underline-Plain
-Underline-Squiggle
-Underline-TT
-Diagonal
-Strike-Out</property>
-                  </widget>
+                    <property name="model">model3</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer3"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -223,15 +326,17 @@ Strike-Out</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="preferences_combo:text:Underline-Plain,Underline-Squiggle,Underline-TT,Diagonal,Strike-Out:0:indicators.style.error">
+                  <object class="GtkComboBox" id="preferences_combo:text:Underline-Plain,Underline-Squiggle,Underline-TT,Diagonal,Strike-Out:0:indicators.style.error">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="items" translatable="yes" comments="Error/Warning indication style in editor">Underline-Plain
-Underline-Squiggle
-Underline-TT
-Diagonal
-Strike-Out</property>
-                  </widget>
+                    <property name="model">model4</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer4"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -239,32 +344,29 @@ Strike-Out</property>
                     <property name="bottom_attach">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label139">
+            <child type="label">
+              <object class="GtkLabel" id="label139">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;Indicators&lt;/b&gt;</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="frame38">
+          <object class="GtkFrame" id="frame38">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkTable" id="table20">
+              <object class="GtkTable" id="table20">
                 <property name="visible">True</property>
                 <property name="border_width">10</property>
                 <property name="n_rows">1</property>
@@ -278,76 +380,71 @@ Strike-Out</property>
                   <placeholder/>
                 </child>
                 <child>
-                  <widget class="GtkColorButton" id="preferences_color:color:#E00000:0:messages.color.error">
+                  <object class="GtkColorButton" id="preferences_color:color:#E00000:0:messages.color.error">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">5</property>
                     <property name="right_attach">6</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkColorButton" id="preferences_color:color:#F05000:0:messages.color.warning">
+                  <object class="GtkColorButton" id="preferences_color:color:#F05000:0:messages.color.warning">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">3</property>
                     <property name="right_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label145">
+                  <object class="GtkLabel" id="label145">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Warnings:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="right_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label144">
+                  <object class="GtkLabel" id="label144">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Errors:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="right_attach">5</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label143">
+            <child type="label">
+              <object class="GtkLabel" id="label143">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;Message colors&lt;/b&gt;</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>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/message-view/plugin.c b/plugins/message-view/plugin.c
index cf52877..c37d38b 100644
--- a/plugins/message-view/plugin.c
+++ b/plugins/message-view/plugin.c
@@ -28,7 +28,7 @@
 #include "anjuta-msgman.h"
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-message-manager.ui"
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-message-manager-plugin.glade"
+#define PREFS_BUILDER PACKAGE_DATA_DIR"/glade/anjuta-message-manager-plugin.glade"
 
 /* Pixmaps */
 #define ANJUTA_PIXMAP_MESSAGES                "anjuta-messages-plugin-48.png"
@@ -431,17 +431,23 @@ static guint notify_id;
 static void
 ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
 {
-		GladeXML *gxml;
-		MessageViewPlugin* plugin = ANJUTA_PLUGIN_MESSAGE_VIEW (ipref);
-		/* Create the messages preferences page */
-		gxml = glade_xml_new (PREFS_GLADE, "preferences_dialog_messages", NULL);
-		anjuta_preferences_add_page (prefs, gxml,
+	GtkBuilder *bxml = gtk_builder_new ();
+	GError* error = NULL;
+	MessageViewPlugin* plugin = ANJUTA_PLUGIN_MESSAGE_VIEW (ipref);
+	/* Create the messages preferences page */
+
+	if (!gtk_builder_add_from_file (bxml, PREFS_BUILDER, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+	anjuta_preferences_add_from_builder (prefs, bxml,
 									"Messages", _("Messages"),
 									 ANJUTA_PIXMAP_MESSAGES);
-		notify_id = anjuta_preferences_notify_add_string (prefs, MESSAGES_TABS_POS, 
-		                                                on_notify_message_pref, plugin->msgman, NULL);
+	notify_id = anjuta_preferences_notify_add_string (prefs, MESSAGES_TABS_POS, 
+	                                                on_notify_message_pref, plugin->msgman, NULL);
 		
-		g_object_unref (gxml);
+	g_object_unref (bxml);
 }
 
 static void
diff --git a/plugins/patch/Makefile.am b/plugins/patch/Makefile.am
index bf10d11..2070bbd 100644
--- a/plugins/patch/Makefile.am
+++ b/plugins/patch/Makefile.am
@@ -43,7 +43,6 @@ libanjuta_patch_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_patch_la_LIBADD = \
-	$(GLADE_LIBS) \
 	$(LIBANJUTA_LIBS) 
 
 EXTRA_DIST = \
diff --git a/plugins/patch/patch-plugin.c b/plugins/patch/patch-plugin.c
index d9dea11..e3452b0 100644
--- a/plugins/patch/patch-plugin.c
+++ b/plugins/patch/patch-plugin.c
@@ -22,7 +22,7 @@
 #include "plugin.h"
 #include "patch-plugin.h"
 
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/patch-plugin.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/patch-plugin.glade"
 
 static void patch_level_changed (GtkAdjustment *adj);
 
@@ -73,17 +73,22 @@ patch_show_gui (PatchPlugin *plugin)
 	GtkWidget* table;
 	GtkWidget* scale;
 	GtkAdjustment* adj;
-  gchar* uri = get_project_uri(plugin);
-  GtkFileFilter* filter;
+	GError* error = NULL;
+	gchar* uri = get_project_uri(plugin);
+	GtkFileFilter* filter;
 	
-	GladeXML* gxml;
-	
-	gxml = glade_xml_new(GLADE_FILE, "patch_dialog", NULL);
-	
-	plugin->dialog = glade_xml_get_widget(gxml, "patch_dialog");
-	plugin->output_label = glade_xml_get_widget(gxml, "output");
+	GtkBuilder* bxml = gtk_builder_new ();
+
+	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	plugin->dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "patch_dialog"));
+	plugin->output_label = GTK_WIDGET (gtk_builder_get_object (bxml, "output"));
 	
-	table = glade_xml_get_widget(gxml, "patch_table");
+	table = GTK_WIDGET (gtk_builder_get_object (bxml, "patch_table"));
 
 	plugin->file_chooser = gtk_file_chooser_button_new(_("File/Directory to patch"),
 																										 GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
@@ -120,14 +125,14 @@ patch_show_gui (PatchPlugin *plugin)
 	gtk_table_attach_defaults(GTK_TABLE(table), plugin->file_chooser, 1, 2, 0, 1);
 	gtk_table_attach_defaults(GTK_TABLE(table), plugin->patch_chooser, 1, 2, 1, 2);
 	
-	scale = glade_xml_get_widget(gxml, "patch_level_scale");
+	scale = GTK_WIDGET (gtk_builder_get_object (bxml, "patch_level_scale"));
 	adj = gtk_range_get_adjustment(GTK_RANGE(scale));
 	g_signal_connect (G_OBJECT(adj), "value_changed",
 			    G_CALLBACK (patch_level_changed), NULL);
 		
-	plugin->patch_button = glade_xml_get_widget(gxml, "patch_button");
-	plugin->cancel_button = glade_xml_get_widget(gxml, "cancel_button");
-	plugin->dry_run_check = glade_xml_get_widget(gxml, "dryrun");
+	plugin->patch_button = GTK_WIDGET (gtk_builder_get_object (bxml, "patch_button"));
+	plugin->cancel_button = GTK_WIDGET (gtk_builder_get_object (bxml, "cancel_button"));
+	plugin->dry_run_check = GTK_WIDGET (gtk_builder_get_object (bxml, "dryrun"));
 	
 	g_signal_connect (G_OBJECT (plugin->patch_button), "clicked", 
 			G_CALLBACK(on_ok_clicked), plugin);
diff --git a/plugins/patch/patch-plugin.glade b/plugins/patch/patch-plugin.glade
index a844cf9..5d47082 100644
--- a/plugins/patch/patch-plugin.glade
+++ b/plugins/patch/patch-plugin.glade
@@ -1,20 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--Generated with glade3 3.4.0 on Fri Feb  1 11:57:23 2008 
 	Version: 2.91.3
 	Date: Sat Jul 29 21:16:15 2006
 	User: jhs
 	Host: idefix
 -->
-<glade-interface>
-  <widget class="GtkDialog" id="patch_dialog">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">10</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">0</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkDialog" id="patch_dialog">
     <property name="title" translatable="yes">Patch</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="patch_table">
+          <object class="GtkTable" id="patch_table">
             <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
@@ -26,12 +33,11 @@
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="dryrun">
+              <object class="GtkCheckButton" id="dryrun">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Dry run</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="right_attach">2</property>
                 <property name="top_attach">3</property>
@@ -39,9 +45,9 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="output">
+              <object class="GtkLabel" id="output">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="right_attach">2</property>
                 <property name="top_attach">4</property>
@@ -49,45 +55,45 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label1">
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="xpad">5</property>
                 <property name="ypad">5</property>
                 <property name="label" translatable="yes">File/Directory to patch:</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label2">
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="xpad">5</property>
                 <property name="ypad">5</property>
                 <property name="label" translatable="yes">Patch file:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="label3">
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="xpad">5</property>
                 <property name="ypad">5</property>
                 <property name="label" translatable="yes">Patch level:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHScale" id="patch_level_scale">
-                <property name="adjustment">0 0 10 0 10 0</property>
+              <object class="GtkHScale" id="patch_level_scale">
+                <property name="adjustment">adjustment1</property>
                 <property name="digits">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -95,46 +101,47 @@
                 <property name="bottom_attach">3</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancel_button">
+              <object class="GtkButton" id="cancel_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="patch_button">
+              <object class="GtkButton" id="patch_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="no">gtk-apply</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/project-manager/create_dialogs.glade b/plugins/project-manager/create_dialogs.glade
index facca2d..05b4595 100644
--- a/plugins/project-manager/create_dialogs.glade
+++ b/plugins/project-manager/create_dialogs.glade
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="new_group_dialog">
-    <property name="visible">True</property>
+<interface>
+  <object class="GtkDialog" id="new_group_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">New Group</property>
@@ -13,131 +11,131 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">12</property>
             <child>
-              <widget class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label1">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">_Group name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">group_name_entry</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="group_name_entry">
+                  <object class="GtkEntry" id="group_name_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">*</property>
                     <property name="activates_default">True</property>
-                    <signal name="changed" handler="on_group_name_entry_changed"/>
-                  </widget>
+                    <signal handler="on_group_name_entry_changed" name="changed"/>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox2">
+              <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label2">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Specify _where to create the group:</property>
                     <property name="use_underline">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkScrolledWindow" id="groups_ph">
+                  <object class="GtkScrolledWindow" id="groups_ph">
                     <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>
                     <child>
-                      <widget class="Custom" id="groups_view">
+                      <object class="GbfProjectView" id="groups_view">
                         <property name="visible">True</property>
-                        <property name="string1">GbfProjectView</property>
-                      </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>
           <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="can_default">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancel_button">
+              <object class="GtkButton" id="cancel_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="ok_button">
+              <object class="GtkButton" id="ok_group_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="new_target_dialog">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">ok_group_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="new_target_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">New Target</property>
     <property name="modal">True</property>
@@ -146,29 +144,30 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox3">
+      <object class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox4">
+          <object class="GtkVBox" id="vbox4">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">12</property>
             <child>
-              <widget class="GtkTable" id="table1">
+              <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">6</property>
                 <property name="row_spacing">6</property>
                 <child>
-                  <widget class="Custom" id="target_type_combo">
+                  <object class="GtkComboBox" id="target_type_combo">
                     <property name="visible">True</property>
-                    <property name="string1">GtkComboBox</property>
-                    <accessibility>
-                      <atkproperty name="AtkObject::accessible_name" translatable="yes">TargetTypes</atkproperty>
-                    </accessibility>
-                  </widget>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="a11y-target_type_combo1">
+                        <property name="AtkObject::accessible_name" translatable="yes">TargetTypes</property>
+                      </object>
+                    </child>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
@@ -179,133 +178,133 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label5">
+                  <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Target _type:</property>
                     <property name="use_underline">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="target_name_entry">
+                  <object class="GtkEntry" id="target_name_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">*</property>
                     <property name="activates_default">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label3">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Target _name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">target_name_entry</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox5">
+              <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <widget class="GtkLabel" id="label4">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Specify _where to create the target:</property>
                     <property name="use_underline">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkScrolledWindow" id="groups_ph">
+                  <object class="GtkScrolledWindow" id="target_groups_ph">
                     <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>
                     <child>
-                      <widget class="Custom" id="groups_view">
+                      <object class="GbfProjectView" id="target_groups_view">
                         <property name="visible">True</property>
-                        <property name="string1">GbfProjectView</property>
-                      </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>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="ok_button">
+              <object class="GtkButton" id="ok_target_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="add_source_dialog">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">button2</action-widget>
+      <action-widget response="-5">ok_target_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="add_source_dialog">
     <property name="can_default">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Add Source</property>
@@ -316,71 +315,70 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox6">
+      <object class="GtkVBox" id="vbox6">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox7">
+          <object class="GtkVBox" id="vbox7">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">12</property>
             <child>
-              <widget class="GtkVBox" id="vbox8">
+              <object class="GtkVBox" id="vbox8">
                 <property name="visible">True</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">Select the _target for the new source files:</property>
                     <property name="use_underline">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkScrolledWindow" id="targets_ph">
+                  <object class="GtkScrolledWindow" id="targets_ph">
                     <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>
                     <child>
-                      <widget class="Custom" id="targets_view">
+                      <object class="GbfProjectView" id="targets_view">
                         <property name="visible">True</property>
-                        <property name="string1">GbfProjectView</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkTable" id="table2">
+              <object class="GtkTable" id="table2">
                 <property name="visible">True</property>
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <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_AUTOMATIC</property>
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="source_file_tree">
+                      <object class="GtkTreeView" id="source_file_tree">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="headers_visible">False</property>
                         <property name="fixed_height_mode">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
@@ -390,79 +388,81 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="browse_button">
+                  <object class="GtkButton" id="browse_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="label" translatable="yes">_Select file to add...</property>
                     <property name="use_underline">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="x_options"></property>
-                    <property name="y_options"></property>
+                    <property name="x_options"/>
+                    <property name="y_options"/>
                     <property name="x_padding">5</property>
                     <property name="y_padding">2</property>
                   </packing>
                 </child>
                 <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">Source files:</property>
-                  </widget>
+                  </object>
                   <packing>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                     <property name="x_padding">5</property>
                     <property name="y_padding">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox2">
+          <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button4">
+              <object class="GtkButton" id="button4">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="ok_button">
+              <object class="GtkButton" id="ok_source_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">button4</action-widget>
+      <action-widget response="-5">ok_source_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/project-manager/gbf-project-util.c b/plugins/project-manager/gbf-project-util.c
index 172c312..5870b77 100644
--- a/plugins/project-manager/gbf-project-util.c
+++ b/plugins/project-manager/gbf-project-util.c
@@ -26,7 +26,6 @@
 
 #include <string.h>
 #include <stdarg.h>
-#include <glade/glade-xml.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -46,42 +45,19 @@ enum {
     N_COLUMNS
 };
 
-static GtkWidget *
-custom_widget_handler (GladeXML *xml,
-                       gchar    *func_name,
-                       gchar    *name,
-                       gchar    *string1,
-                       gchar    *string2,
-                       gint      int1,
-                       gint      int2,
-                       gpointer  user_data)
-{
-    GtkWidget *wid = NULL;
-
-    if (!strcmp (string1, "GtkComboBox")) {
-        wid = gtk_combo_box_new ();
-    } else if (!strcmp (string1, "GbfProjectView")) {
-        wid = gbf_project_view_new ();
-    } else {
-        g_warning ("Unknown custom widget type '%s'", string1);
-    }
-
-    return wid;
-}
-
-static GladeXML *
+static GtkBuilder *
 load_interface (const gchar *top_widget)
 {
-    GladeXML *xml;
-
-    glade_set_custom_handler (custom_widget_handler, NULL);
-    xml = glade_xml_new (GLADE_FILE, top_widget, GETTEXT_PACKAGE);
+    GtkBuilder *xml = gtk_builder_new ();
+    GError* error = NULL;
 
-    if (!xml) {
-        g_warning ("%s", _("Couldn't load glade file"));
+    if (!gtk_builder_add_from_file (xml, GLADE_FILE, &error))
+    {
+        g_warning ("Couldn't load builder file: %s", error->message);
+        g_error_free (error);
         return NULL;
     }
-    
+
     return xml;
 }
 
@@ -193,7 +169,7 @@ gbf_project_util_new_group (GbfProjectModel *model,
                             const gchar     *default_group,
                             const gchar     *default_group_name_to_add)
 {
-    GladeXML *gui;
+    GtkBuilder *gui;
     GtkWidget *dialog, *group_name_entry, *ok_button;
     GtkWidget *groups_view;
     gint response;
@@ -211,10 +187,10 @@ gbf_project_util_new_group (GbfProjectModel *model,
     g_return_val_if_fail (gui != NULL, NULL);
     
     /* get all needed widgets */
-    dialog = glade_xml_get_widget (gui, "new_group_dialog");
-    groups_view = glade_xml_get_widget (gui, "groups_view");
-    group_name_entry = glade_xml_get_widget (gui, "group_name_entry");
-    ok_button = glade_xml_get_widget (gui, "ok_button");
+    dialog = GTK_WIDGET (gtk_builder_get_object (gui, "new_group_dialog"));
+    groups_view = GTK_WIDGET (gtk_builder_get_object (gui, "groups_view"));
+    group_name_entry = GTK_WIDGET (gtk_builder_get_object (gui, "group_name_entry"));
+    ok_button = GTK_WIDGET (gtk_builder_get_object (gui, "ok_group_button"));
     
     /* set up dialog */
     if (default_group_name_to_add)
@@ -338,7 +314,7 @@ gbf_project_util_new_target (GbfProjectModel *model,
                              const gchar     *default_group,
                              const gchar     *default_target_name_to_add)
 {
-    GladeXML *gui;
+    GtkBuilder *gui;
     GtkWidget *dialog, *target_name_entry, *ok_button;
     GtkWidget *target_type_combo, *groups_view;
     GtkListStore *types_store;
@@ -358,11 +334,11 @@ gbf_project_util_new_target (GbfProjectModel *model,
     g_return_val_if_fail (gui != NULL, NULL);
     
     /* get all needed widgets */
-    dialog = glade_xml_get_widget (gui, "new_target_dialog");
-    groups_view = glade_xml_get_widget (gui, "groups_view");
-    target_name_entry = glade_xml_get_widget (gui, "target_name_entry");
-    target_type_combo = glade_xml_get_widget (gui, "target_type_combo");
-    ok_button = glade_xml_get_widget (gui, "ok_button");
+    dialog = GTK_WIDGET (gtk_builder_get_object (gui, "new_target_dialog"));
+    groups_view = GTK_WIDGET (gtk_builder_get_object (gui, "target_groups_view"));
+    target_name_entry = GTK_WIDGET (gtk_builder_get_object (gui, "target_name_entry"));
+    target_type_combo = GTK_WIDGET (gtk_builder_get_object (gui, "target_type_combo"));
+    ok_button = GTK_WIDGET (gtk_builder_get_object (gui, "ok_target_button"));
     
     /* set up dialog */
     if (default_target_name_to_add)
@@ -653,7 +629,7 @@ gbf_project_util_add_source_multi (GbfProjectModel *model,
 				   const gchar     *default_group,
 				   GList     *uris_to_add)
 {
-    GladeXML *gui;
+    GtkBuilder *gui;
     GtkWidget *dialog, *source_file_tree;
     GtkWidget *ok_button, *browse_button;
     GtkWidget *targets_view;
@@ -677,11 +653,11 @@ gbf_project_util_add_source_multi (GbfProjectModel *model,
     g_return_val_if_fail (gui != NULL, NULL);
     
     /* get all needed widgets */
-    dialog = glade_xml_get_widget (gui, "add_source_dialog");
-    targets_view = glade_xml_get_widget (gui, "targets_view");
-    source_file_tree = glade_xml_get_widget (gui, "source_file_tree");
-    browse_button = glade_xml_get_widget (gui, "browse_button");
-    ok_button = glade_xml_get_widget (gui, "ok_button");
+    dialog = GTK_WIDGET (gtk_builder_get_object (gui, "add_source_dialog"));
+    targets_view = GTK_WIDGET (gtk_builder_get_object (gui, "targets_view"));
+    source_file_tree = GTK_WIDGET (gtk_builder_get_object (gui, "source_file_tree"));
+    browse_button = GTK_WIDGET (gtk_builder_get_object (gui, "browse_button"));
+    ok_button = GTK_WIDGET (gtk_builder_get_object (gui, "ok_source_button"));
     
     /* Prepare file tree */
     list = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
diff --git a/plugins/run-program/Makefile.am b/plugins/run-program/Makefile.am
index 486c3d4..c094d1f 100644
--- a/plugins/run-program/Makefile.am
+++ b/plugins/run-program/Makefile.am
@@ -30,7 +30,6 @@ libanjuta_run_program_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_run_program_la_LIBADD = \
 	$(GNOME_UI_LIBS) \
-	$(GLADE_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_run_program_la_SOURCES = \
diff --git a/plugins/run-program/anjuta-run-program.glade b/plugins/run-program/anjuta-run-program.glade
index 98c3fd9..e6b9b17 100644
--- a/plugins/run-program/anjuta-run-program.glade
+++ b/plugins/run-program/anjuta-run-program.glade
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="parameters_dialog">
+<interface>
+  <object class="GtkDialog" id="parameters_dialog">
     <property name="title" translatable="yes">Program Parameters</property>
     <property name="modal">True</property>
     <property name="default_width">400</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <property name="spacing">6</property>
         <child>
-          <widget class="GtkTable" id="table34">
+          <object class="GtkTable" id="table34">
             <property name="visible">True</property>
             <property name="border_width">6</property>
             <property name="n_rows">5</property>
@@ -21,134 +20,132 @@
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
             <child>
-              <widget class="GtkCheckButton" id="parameter_run_in_term_check">
+              <object class="GtkCheckButton" id="parameter_run_in_term_check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Run In Terminal</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="right_attach">3</property>
                 <property name="top_attach">4</property>
                 <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBoxEntry" id="parameter_combo">
+              <object class="GtkComboBoxEntry" id="parameter_combo">
                 <property name="visible">True</property>
                 <child internal-child="entry">
-                  <widget class="GtkEntry" id="comboboxentry-entry2">
-                  </widget>
+                  <object class="GtkEntry" id="comboboxentry-entry2">
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">3</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label12354">
+              <object class="GtkLabel" id="label12354">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Arguments:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBoxEntry" id="target_combo">
+              <object class="GtkComboBoxEntry" id="target_combo">
                 <property name="visible">True</property>
                 <child internal-child="entry">
-                  <widget class="GtkEntry" id="comboboxentry-entry1">
-                  </widget>
+                  <object class="GtkEntry" id="comboboxentry-entry1">
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
                 <property name="y_padding">3</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="target_button">
+              <object class="GtkButton" id="target_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label">gtk-open</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="right_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label12353">
+              <object class="GtkLabel" id="label12353">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Program:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="events"></property>
+                <property name="events"/>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Working Directory:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkFileChooserButton" id="working_dir_chooser">
+              <object class="GtkFileChooserButton" id="working_dir_chooser">
                 <property name="visible">True</property>
-                <property name="events"></property>
+                <property name="events"/>
                 <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                 <property name="title" translatable="yes">Choose a working directory</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">3</property>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkExpander" id="expander1">
+              <object class="GtkExpander" id="expander1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox6">
+                  <object class="GtkHBox" id="hbox6">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="spacing">5</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                      <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -156,46 +153,44 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_OUT</property>
                         <child>
-                          <widget class="GtkTreeView" id="environment_treeview">
+                          <object class="GtkTreeView" id="environment_treeview">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkVButtonBox" id="vbuttonbox2">
+                      <object class="GtkVButtonBox" id="vbuttonbox2">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">5</property>
                         <property name="layout_style">GTK_BUTTONBOX_START</property>
                         <child>
-                          <widget class="GtkButton" id="add_button">
+                          <object class="GtkButton" id="add_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label">gtk-new</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="edit_button">
+                          <object class="GtkButton" id="edit_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label">gtk-edit</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="remove_button">
+                          <object class="GtkButton" id="remove_button">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -203,78 +198,76 @@
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label">gtk-delete</property>
                             <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">2</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">Environment Variables:</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="right_attach">3</property>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="padding">5</property>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area7">
+          <object class="GtkHButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancel_button">
+              <object class="GtkButton" id="cancel_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="ok_button">
+              <object class="GtkButton" id="ok_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-apply</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-10</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-10">ok_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/run-program/parameters.c b/plugins/run-program/parameters.c
index f4a046d..697cbe7 100644
--- a/plugins/run-program/parameters.c
+++ b/plugins/run-program/parameters.c
@@ -34,7 +34,7 @@
 /*---------------------------------------------------------------------------*/
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-run-program.ui"
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-run-program.glade"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-run-program.glade"
 
 #define PARAMETERS_DIALOG "parameters_dialog"
 #define TERMINAL_CHECK_BUTTON "parameter_run_in_term_check"
@@ -583,7 +583,7 @@ on_environment_value_edited (GtkCellRendererText *cell,
 static RunDialog*
 run_dialog_init (RunDialog *dlg, RunProgramPlugin *plugin)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml;
 	GtkWindow *parent;
 	GtkCellRenderer *renderer;	
 	GtkTreeModel* model;
@@ -592,39 +592,43 @@ run_dialog_init (RunDialog *dlg, RunProgramPlugin *plugin)
 	GObject *button;
 	GValue value = {0,};
 	const gchar *project_root_uri;
+	GError* error = NULL;
 	
 	parent = GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell);
-	gxml = glade_xml_new (GLADE_FILE, PARAMETERS_DIALOG, NULL);
-	if (gxml == NULL)
+	bxml = gtk_builder_new ();
+
+	if (!gtk_builder_add_from_file (bxml, BUILDER_FILE, &error))
 	{
-		anjuta_util_dialog_error(parent, _("Missing file %s"), GLADE_FILE);
+		g_warning ("Couldn't load builder file: %s", error->message);
+		anjuta_util_dialog_error(parent, _("Missing file %s"), BUILDER_FILE);
+		g_error_free (error);
 		return NULL;
 	}
 	
 	dlg->plugin = plugin;
 		
-	dlg->win = glade_xml_get_widget (gxml, PARAMETERS_DIALOG);
-	dlg->term = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gxml, TERMINAL_CHECK_BUTTON));
-	dlg->args = GTK_COMBO_BOX (glade_xml_get_widget (gxml, PARAMETER_COMBO));
-	dlg->target = GTK_COMBO_BOX (glade_xml_get_widget (gxml, TARGET_COMBO));
-	dlg->vars = GTK_TREE_VIEW (glade_xml_get_widget (gxml, VAR_TREEVIEW));
-	dlg->dirs = GTK_FILE_CHOOSER (glade_xml_get_widget (gxml, DIR_CHOOSER));
-	dlg->remove_button = glade_xml_get_widget (gxml, REMOVE_VAR_BUTTON);
-	dlg->edit_button = glade_xml_get_widget (gxml, EDIT_VAR_BUTTON);
+	dlg->win = GTK_WIDGET (gtk_builder_get_object (bxml, PARAMETERS_DIALOG));
+	dlg->term = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TERMINAL_CHECK_BUTTON));
+	dlg->args = GTK_COMBO_BOX (gtk_builder_get_object (bxml, PARAMETER_COMBO));
+	dlg->target = GTK_COMBO_BOX (gtk_builder_get_object (bxml, TARGET_COMBO));
+	dlg->vars = GTK_TREE_VIEW (gtk_builder_get_object (bxml, VAR_TREEVIEW));
+	dlg->dirs = GTK_FILE_CHOOSER (gtk_builder_get_object (bxml, DIR_CHOOSER));
+	dlg->remove_button = GTK_WIDGET (gtk_builder_get_object (bxml, REMOVE_VAR_BUTTON));
+	dlg->edit_button = GTK_WIDGET (gtk_builder_get_object (bxml, EDIT_VAR_BUTTON));
 
 	/* Connect signals */	
-	button = G_OBJECT (glade_xml_get_widget (gxml, TARGET_BUTTON));
+	button = gtk_builder_get_object (bxml, TARGET_BUTTON);
 	g_signal_connect_swapped (button, "clicked", G_CALLBACK (on_select_target), dlg);
-	button = G_OBJECT (glade_xml_get_widget (gxml, ADD_VAR_BUTTON));
+	button = gtk_builder_get_object (bxml, ADD_VAR_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_environment_add_button), dlg->vars);
-	button = G_OBJECT (glade_xml_get_widget (gxml, EDIT_VAR_BUTTON));
+	button = gtk_builder_get_object (bxml, EDIT_VAR_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_environment_edit_button), dlg->vars);
-	button = G_OBJECT (glade_xml_get_widget (gxml, REMOVE_VAR_BUTTON));
+	button = gtk_builder_get_object (bxml, REMOVE_VAR_BUTTON);
 	g_signal_connect (button, "clicked", G_CALLBACK (on_environment_remove_button), dlg);
 	selection = gtk_tree_view_get_selection (dlg->vars);
 	g_signal_connect (selection, "changed", G_CALLBACK (on_environment_selection_changed), dlg);
 	
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 
 	/* Fill parameter combo box */
 	model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am
index 7642f82..d3d4bd5 100644
--- a/plugins/search/Makefile.am
+++ b/plugins/search/Makefile.am
@@ -34,7 +34,6 @@ libanjuta_search_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libanjuta_search_la_LIBADD = \
 	$(GNOME_PRINT_UI_LIBS) \
 	$(GNOME_UI_LIBS) \
-	$(GLADE_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_search_la_SOURCES= \
diff --git a/plugins/search/anjuta-search.glade b/plugins/search/anjuta-search.glade
index 9e28518..b44db6d 100644
--- a/plugins/search/anjuta-search.glade
+++ b/plugins/search/anjuta-search.glade
@@ -1,48 +1,104 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="dialog.search.replace">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">400</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">100</property>
+  </object>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">$(module.source.files) $(module.include.files)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">CVS</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">CVS intl po </col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">*.so *.o *.a *.la</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">*\.*</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="dialog.search.replace">
     <property name="title" translatable="yes">Find &amp; Replace</property>
-    <signal name="key_press_event" handler="on_search_dialog_key_press_event" after="yes" object="dialog.search.replace"/>
-    <signal name="delete_event" handler="on_search_replace_delete_event"/>
+    <signal after="yes" handler="on_search_dialog_key_press_event" name="key_press_event" object="dialog.search.replace"/>
+    <signal handler="on_search_replace_delete_event" name="delete_event"/>
     <child>
-      <widget class="GtkFrame" id="frame9">
+      <object class="GtkFrame" id="frame9">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">GTK_SHADOW_NONE</property>
         <child>
-          <widget class="GtkVBox" id="vbox10">
+          <object class="GtkVBox" id="vbox10">
             <property name="visible">True</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>
                 <child>
-                  <widget class="GtkNotebook" id="search.notebook">
+                  <object class="GtkNotebook" id="search.notebook">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
-                      <widget class="GtkFrame" id="frame.search.expression">
+                      <object class="GtkFrame" id="frame.search.expression">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
-                          <widget class="GtkTable" id="table3">
+                          <object class="GtkTable" id="table3">
                             <property name="visible">True</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">1</property>
                             <property name="column_spacing">10</property>
                             <property name="row_spacing">7</property>
                             <child>
-                              <widget class="GtkFrame" id="frame50">
+                              <object class="GtkFrame" id="frame50">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkTable" id="table30">
+                                  <object class="GtkTable" id="table30">
                                     <property name="visible">True</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">3</property>
@@ -52,135 +108,129 @@
                                       <placeholder/>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="replace.regex">
+                                      <object class="GtkCheckButton" id="replace.regex">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Expand regex back references</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">4</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBoxEntry" id="replace.string.combo">
+                                      <object class="GtkComboBoxEntry" id="replace.string.combo">
                                         <property name="visible">True</property>
                                         <child internal-child="entry">
-                                          <widget class="GtkEntry" id="comboboxentry-entry2">
-                                          </widget>
+                                          <object class="GtkEntry" id="comboboxentry-entry2">
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label.replace">
+                                      <object class="GtkLabel" id="label.replace">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="xpad">5</property>
                                         <property name="label" translatable="yes">Replace With:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBoxEntry" id="search.string.combo">
+                                      <object class="GtkComboBoxEntry" id="search.string.combo">
                                         <property name="visible">True</property>
                                         <child internal-child="entry">
-                                          <widget class="GtkEntry" id="comboboxentry-entry1">
-                                          </widget>
+                                          <object class="GtkEntry" id="comboboxentry-entry1">
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </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="xpad">5</property>
-                                        <property name="label" translatable="yes" comments="This is &quot;the search expression&quot; (noun)">Search Expression:</property>
+                                        <property comments="This is &quot;the search expression&quot; (noun)" name="label" translatable="yes">Search Expression:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label12357">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label12357">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Parameters&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="frame.search.basic">
+                              <object class="GtkFrame" id="frame.search.basic">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox1127">
+                                  <object class="GtkHBox" id="hbox1127">
                                     <property name="visible">True</property>
                                     <property name="border_width">5</property>
                                     <property name="spacing">20</property>
                                     <child>
-                                      <widget class="GtkRadioButton" id="search.full_buffer">
+                                      <object class="GtkRadioButton" id="search.full_buffer">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Full Buffer</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_search_full_buffer_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_full_buffer_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkRadioButton" id="search.forward">
+                                      <object class="GtkRadioButton" id="search.forward">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Forward</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">search.full_buffer</property>
-                                        <signal name="toggled" handler="on_search_forward_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_forward_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
@@ -188,35 +238,31 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkRadioButton" id="search.backward">
+                                      <object class="GtkRadioButton" id="search.backward">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Backward</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">search.full_buffer</property>
-                                        <signal name="toggled" handler="on_search_backward_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_backward_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label12356">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label12356">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Scope&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
@@ -224,176 +270,166 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="frame51">
+                              <object class="GtkFrame" id="frame51">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkTable" id="table31">
+                                  <object class="GtkTable" id="table31">
                                     <property name="visible">True</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">3</property>
                                     <property name="n_columns">2</property>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.match.word.start">
+                                      <object class="GtkCheckButton" id="search.match.word.start">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Match at start of word</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_search_match_word_start_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_match_word_start_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.match.whole.line">
+                                      <object class="GtkCheckButton" id="search.match.whole.line">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Match complete lines</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_search_match_whole_line_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_match_whole_line_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.greedy">
+                                      <object class="GtkCheckButton" id="search.greedy">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Greedy matching</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.match.whole.word">
+                                      <object class="GtkCheckButton" id="search.match.whole.word">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Match complete words</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_search_match_whole_word_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_match_whole_word_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.match.case">
+                                      <object class="GtkCheckButton" id="search.match.case">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Match case</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.regex">
+                                      <object class="GtkCheckButton" id="search.regex">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Regular expression</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_search_regex_toggled"/>
-                                      </widget>
+                                        <signal handler="on_search_regex_toggled" name="toggled"/>
+                                      </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label12355">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label12355">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="search.expression.tab">
+                    <child type="tab">
+                      <object class="GtkLabel" id="search.expression.tab">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes" comments="This is &quot;the search expression&quot; (noun)">Search Expression</property>
+                        <property comments="This is &quot;the search expression&quot; (noun)" name="label" translatable="yes">Search Expression</property>
                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                      </widget>
+                      </object>
                       <packing>
-                        <property name="type">tab</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="frame.search.target">
+                      <object class="GtkFrame" id="frame.search.target">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
-                          <widget class="GtkTable" id="table4">
+                          <object class="GtkTable" id="table4">
                             <property name="visible">True</property>
                             <property name="n_rows">4</property>
                             <property name="n_columns">2</property>
                             <child>
-                              <widget class="GtkFrame" id="frame60">
+                              <object class="GtkFrame" id="frame60">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkTable" id="table33">
+                                  <object class="GtkTable" id="table33">
                                     <property name="visible">True</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">2</property>
@@ -401,78 +437,75 @@
                                     <property name="column_spacing">5</property>
                                     <property name="row_spacing">5</property>
                                     <child>
-                                      <widget class="GtkComboBox" id="search.target.combo">
+                                      <object class="GtkComboBox" id="search.target.combo">
                                         <property name="visible">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBox" id="search.direction.combo">
+                                      <object class="GtkComboBox" id="search.direction.combo">
                                         <property name="visible">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label38">
+                                      <object class="GtkLabel" id="label38">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Search Direction:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label30">
+                                      <object class="GtkLabel" id="label30">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Search In:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label12358">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label12358">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Scope&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="frame56">
+                              <object class="GtkFrame" id="frame56">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkTable" id="table32">
+                                  <object class="GtkTable" id="table32">
                                     <property name="visible">True</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">2</property>
@@ -480,37 +513,36 @@
                                     <property name="column_spacing">5</property>
                                     <property name="row_spacing">5</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox1128">
+                                      <object class="GtkHBox" id="hbox1128">
                                         <property name="visible">True</property>
                                         <property name="spacing">5</property>
                                         <child>
-                                          <widget class="GtkSpinButton" id="actions.max">
+                                          <object class="GtkSpinButton" id="actions.max">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="adjustment">100 1 400 1 10 0</property>
+                                            <property name="adjustment">adjustment1</property>
                                             <property name="climb_rate">1</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkCheckButton" id="actions.no_limit">
+                                          <object class="GtkCheckButton" id="actions.no_limit">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="label" translatable="yes">No Limit</property>
                                             <property name="use_underline">True</property>
-                                            <property name="response_id">0</property>
                                             <property name="draw_indicator">True</property>
-                                            <signal name="clicked" handler="on_actions_no_limit_clicked"/>
-                                          </widget>
+                                            <signal handler="on_actions_no_limit_clicked" name="clicked"/>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
@@ -521,54 +553,51 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label39">
+                                      <object class="GtkLabel" id="label39">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Maximum Actions</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBox" id="search.action.combo">
+                                      <object class="GtkComboBox" id="search.action.combo">
                                         <property name="visible">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label31">
+                                      <object class="GtkLabel" id="label31">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Search Action:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label12354">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label12354">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Actions&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">3</property>
@@ -577,31 +606,33 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="frame.search.var">
+                              <object class="GtkFrame" id="frame.search.var">
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkComboBoxEntry" id="search.var.combo">
+                                  <object class="GtkComboBoxEntry" id="search.var.combo">
                                     <property name="visible">True</property>
-                                    <property name="items">
-$(module.source.files) $(module.include.files)</property>
                                     <child internal-child="entry">
-                                      <widget class="GtkEntry" id="comboboxentry-entry7">
-                                      </widget>
+                                      <object class="GtkEntry" id="comboboxentry-entry7">
+                                      </object>
                                     </child>
-                                  </widget>
+                                    <property name="model">model1</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer1"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label39">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label41">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes" comments="User can select variables that contain lists of files, so this is a combined noun">&lt;b&gt;Search variable&lt;/b&gt;</property>
+                                    <property comments="User can select variables that contain lists of files, so this is a combined noun" name="label" translatable="yes">&lt;b&gt;Search variable&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
@@ -610,11 +641,11 @@ $(module.source.files) $(module.include.files)</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="frame.file.filter">
+                              <object class="GtkFrame" id="frame.file.filter">
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkTable" id="table5">
+                                  <object class="GtkTable" id="table5">
                                     <property name="visible">True</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">6</property>
@@ -622,208 +653,214 @@ $(module.source.files) $(module.include.files)</property>
                                     <property name="column_spacing">5</property>
                                     <property name="row_spacing">5</property>
                                     <child>
-                                      <widget class="GtkComboBoxEntry" id="dir.filter.unmatch.combo">
+                                      <object class="GtkComboBoxEntry" id="dir.filter.unmatch.combo">
                                         <property name="visible">True</property>
-                                        <property name="items">
-CVS
-CVS intl po </property>
                                         <child internal-child="entry">
-                                          <widget class="GtkEntry" id="comboboxentry-entry6">
-                                          </widget>
+                                          <object class="GtkEntry" id="comboboxentry-entry6">
+                                          </object>
                                         </child>
-                                      </widget>
+                                        <property name="model">model2</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="renderer2"/>
+                                          <attributes>
+                                            <attribute name="text">0</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBoxEntry" id="dir.filter.match.combo">
+                                      <object class="GtkComboBoxEntry" id="dir.filter.match.combo">
                                         <property name="visible">True</property>
                                         <child internal-child="entry">
-                                          <widget class="GtkEntry" id="comboboxentry-entry5">
-                                          </widget>
+                                          <object class="GtkEntry" id="comboboxentry-entry5">
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBoxEntry" id="file.filter.unmatch.combo">
+                                      <object class="GtkComboBoxEntry" id="file.filter.unmatch.combo">
                                         <property name="visible">True</property>
-                                        <property name="items">*.so *.o *.a *.la
-</property>
                                         <child internal-child="entry">
-                                          <widget class="GtkEntry" id="comboboxentry-entry4">
-                                          </widget>
+                                          <object class="GtkEntry" id="comboboxentry-entry4">
+                                          </object>
+                                        </child>
+                                        <property name="model">model3</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="renderer3"/>
+                                          <attributes>
+                                            <attribute name="text">0</attribute>
+                                          </attributes>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBoxEntry" id="file.filter.match.combo">
+                                      <object class="GtkComboBoxEntry" id="file.filter.match.combo">
                                         <property name="visible">True</property>
-                                        <property name="items">*\.*
-*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp
-*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</property>
                                         <child internal-child="entry">
-                                          <widget class="GtkEntry" id="comboboxentry-entry3">
-                                          </widget>
+                                          <object class="GtkEntry" id="comboboxentry-entry3">
+                                          </object>
+                                        </child>
+                                        <property name="model">model4</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="renderer4"/>
+                                          <attributes>
+                                            <attribute name="text">0</attribute>
+                                          </attributes>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="ignore.binary.files">
+                                      <object class="GtkCheckButton" id="ignore.binary.files">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Ignore Binary Files</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.dir.recursive">
+                                      <object class="GtkCheckButton" id="search.dir.recursive">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Search Recursively</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="ignore.hidden.dirs">
+                                      <object class="GtkCheckButton" id="ignore.hidden.dirs">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Ignore Hidden Directories</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label35">
+                                      <object class="GtkLabel" id="label35">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Ignore Directories:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label34">
+                                      <object class="GtkLabel" id="label34">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Choose Directories:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="ignore.hidden.files">
+                                      <object class="GtkCheckButton" id="ignore.hidden.files">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">Ignore Hidden Files</property>
                                         <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label33">
+                                      <object class="GtkLabel" id="label33">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Ignore Files:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label32">
+                                      <object class="GtkLabel" id="label32">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Choose Files:</property>
                                         <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label40">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label40">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;File Filter&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="type">label_item</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">2</property>
@@ -831,73 +868,68 @@ CVS intl po </property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="search.target.tab">
+                    <child type="tab">
+                      <object class="GtkLabel" id="search.target.tab">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Search Target</property>
                         <property name="justify">GTK_JUSTIFY_CENTER</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="GtkFrame" id="frame.setting">
+                      <object class="GtkFrame" id="frame.setting">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox1124">
+                          <object class="GtkVBox" id="vbox1124">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
-                              <widget class="GtkFrame" id="frame54">
+                              <object class="GtkFrame" id="frame54">
                                 <property name="visible">True</property>
                                 <property name="border_width">3</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkCheckButton" id="search.basic">
+                                  <object class="GtkCheckButton" id="search.basic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="label" translatable="yes">Basic Search &amp; Replace</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_setting_basic_search_toggled"/>
-                                  </widget>
+                                    <signal handler="on_setting_basic_search_toggled" name="toggled"/>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFrame" id="frame55">
+                              <object class="GtkFrame" id="frame55">
                                 <property name="visible">True</property>
                                 <property name="border_width">3</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <widget class="GtkVBox" id="vbox1126">
+                                  <object class="GtkVBox" id="vbox1126">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox1126">
+                                      <object class="GtkHBox" id="hbox1126">
                                         <property name="visible">True</property>
                                         <property name="border_width">3</property>
                                         <property name="spacing">3</property>
                                         <child>
-                                          <widget class="GtkScrolledWindow" id="scrolledwindow27">
+                                          <object class="GtkScrolledWindow" id="scrolledwindow27">
                                             <property name="height_request">100</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -905,23 +937,23 @@ CVS intl po </property>
                                             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                             <property name="shadow_type">GTK_SHADOW_IN</property>
                                             <child>
-                                              <widget class="GtkTreeView" id="setting.pref.treeview">
+                                              <object class="GtkTreeView" id="setting.pref.treeview">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
                                         <child>
-                                          <widget class="GtkVBox" id="vbox1125">
+                                          <object class="GtkVBox" id="vbox1125">
                                             <property name="visible">True</property>
                                             <child>
-                                              <widget class="GtkLabel" id="label12343">
+                                              <object class="GtkLabel" id="label12343">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="yalign">0</property>
                                                 <property name="label" translatable="yes">New Name:</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -929,176 +961,165 @@ CVS intl po </property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkEntry" id="setting.pref.entry">
+                                              <object class="GtkEntry" id="setting.pref.entry">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="invisible_char">*</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">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox1129">
+                                      <object class="GtkHBox" id="hbox1129">
                                         <property name="visible">True</property>
                                         <property name="border_width">3</property>
                                         <property name="spacing">10</property>
                                         <property name="homogeneous">True</property>
                                         <child>
-                                          <widget class="GtkButton" id="setting.pref.add">
+                                          <object class="GtkButton" id="setting.pref.add">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="can_default">True</property>
                                             <property name="label">gtk-add</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                            <signal name="clicked" handler="on_setting_pref_add_clicked"/>
-                                          </widget>
+                                            <signal handler="on_setting_pref_add_clicked" name="clicked"/>
+                                          </object>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="setting.pref.remove">
+                                          <object class="GtkButton" id="setting.pref.remove">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="can_default">True</property>
                                             <property name="label">gtk-remove</property>
                                             <property name="use_stock">True</property>
-                                            <property name="response_id">0</property>
-                                            <signal name="clicked" handler="on_setting_pref_remove_clicked"/>
-                                          </widget>
+                                            <signal handler="on_setting_pref_remove_clicked" name="clicked"/>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="setting.pref.modify">
+                                          <object class="GtkButton" id="setting.pref.modify">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="can_default">True</property>
                                             <property name="label" translatable="yes">Modify</property>
                                             <property name="use_underline">True</property>
-                                            <property name="response_id">0</property>
-                                            <signal name="clicked" handler="on_setting_pref_modify_clicked"/>
-                                          </widget>
+                                            <signal handler="on_setting_pref_modify_clicked" name="clicked"/>
+                                          </object>
                                           <packing>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </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>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label12342">
+                    <child type="tab">
+                      <object class="GtkLabel" id="label12342">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Setting</property>
-                      </widget>
+                      </object>
                       <packing>
-                        <property name="type">tab</property>
                         <property name="position">2</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkHButtonBox" id="hbuttonbox7">
+              <object class="GtkHButtonBox" id="hbuttonbox7">
                 <property name="visible">True</property>
                 <property name="border_width">3</property>
                 <property name="spacing">4</property>
                 <property name="layout_style">GTK_BUTTONBOX_END</property>
                 <child>
-                  <widget class="GtkButton" id="button.close">
+                  <object class="GtkButton" id="button.close">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="label">gtk-close</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_search_button_close_clicked"/>
-                  </widget>
+                    <signal handler="on_search_button_close_clicked" name="clicked"/>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button.stop">
+                  <object class="GtkButton" id="button.stop">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="label">gtk-stop</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_search_button_stop_clicked"/>
-                  </widget>
+                    <signal handler="on_search_button_stop_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button.next">
+                  <object class="GtkButton" id="button.next">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="label">gtk-find</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_search_button_next_clicked"/>
-                  </widget>
+                    <signal handler="on_search_button_next_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button.jump">
+                  <object class="GtkButton" id="button.jump">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="label">gtk-find</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_search_button_jump_clicked"/>
-                  </widget>
+                    <signal handler="on_search_button_jump_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/search/search-replace.c b/plugins/search/search-replace.c
index 6cba2ab..d9f0ec7 100644
--- a/plugins/search/search-replace.c
+++ b/plugins/search/search-replace.c
@@ -23,7 +23,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 
 #include <libanjuta/anjuta-utils.h>
 #include <libanjuta/anjuta-plugin.h>
@@ -42,9 +41,9 @@
 #include <libanjuta/interfaces/ianjuta-project-manager.h>
 #include <glib/gi18n.h>
 
-#define GLADE_FILE_SEARCH_REPLACE PACKAGE_DATA_DIR"/glade/anjuta-search.glade"
+#define BUILDER_FILE_SEARCH_REPLACE PACKAGE_DATA_DIR"/glade/anjuta-search.glade"
 
-/* LibGlade's auto-signal-connect will connect to these signals.
+/* GtkBuilder's auto-signal-connect will connect to these signals.
  * Do not declare them static.
  */
 gboolean
@@ -119,7 +118,7 @@ AnjutaUtilStringMap search_action_strings[] = {
 
 typedef struct _SearchReplaceGUI
 {
-	GladeXML *xml;
+	GtkBuilder *bxml;
 	GtkWidget *dialog;
 	gboolean showing;
 } SearchReplaceGUI;
@@ -1277,6 +1276,7 @@ void translate_dialog_strings (AnjutaUtilStringMap labels[])
 static gboolean
 create_dialog(void)
 {
+	GError* error = NULL;
 	GladeWidget *w;
 	GtkWidget *widget;
 	int i;
@@ -1285,15 +1285,17 @@ create_dialog(void)
 	if (NULL != sg) return TRUE;
 	sg = g_new0(SearchReplaceGUI, 1);
 
-	if (NULL == (sg->xml = glade_xml_new(GLADE_FILE_SEARCH_REPLACE,
-		SEARCH_REPLACE_DIALOG, NULL)))
+	sg->bxml = gtk_builder_new ();
+	if (!gtk_builder_add_from_file (sg->bxml, BUILDER_FILE_SEARCH_REPLACE, &error))
 	{
 		anjuta_util_dialog_error(NULL, _("Unable to build user interface for Search And Replace"));
 		g_free(sg);
 		sg = NULL;
+		g_error_free (error);
 		return FALSE;
 	}
-	sg->dialog = glade_xml_get_widget(sg->xml, SEARCH_REPLACE_DIALOG);
+
+	sg->dialog = GTK_WIDGET (gtk_builder_get_object (sg->bxml, SEARCH_REPLACE_DIALOG));
 	/* gtk_window_set_transient_for (GTK_WINDOW(sg->dialog)
 	  , GTK_WINDOW(app->widgets.window)); */
 		
@@ -1308,7 +1310,7 @@ create_dialog(void)
 	for (i=0; NULL != glade_widgets[i].name; ++i)
 	{
 		w = &(glade_widgets[i]);
-		w->widget = glade_xml_get_widget(sg->xml, w->name);
+		w->widget = GTK_WIDGET (gtk_builder_get_object (sg->bxml, w->name));
 		if (GE_COMBO_ENTRY == w->type)
 		{
 			/* Get child of GtkComboBoxEntry */
@@ -1341,8 +1343,8 @@ create_dialog(void)
 
 	search_preferences_initialize_setting_treeview(sg->dialog);
 	search_preferences_init();
-	
-	glade_xml_signal_autoconnect(sg->xml);
+
+	gtk_builder_connect_signals (sg->bxml, NULL);
 	return TRUE;
 }
 
diff --git a/plugins/subversion/Makefile.am b/plugins/subversion/Makefile.am
index 062408b..505c672 100644
--- a/plugins/subversion/Makefile.am
+++ b/plugins/subversion/Makefile.am
@@ -33,8 +33,7 @@ plugin_LTLIBRARIES = libanjuta-subversion.la
 libanjuta_subversion_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_subversion_la_LIBADD = \
-	$(GLADE_LIBS) \
-  $(GIO_LIBS) \
+ $(GIO_LIBS) \
 	$(LIBANJUTA_LIBS) $(SVN_LIB)
 
 libanjuta_subversion_la_SOURCES = \
diff --git a/plugins/subversion/anjuta-subversion.glade b/plugins/subversion/anjuta-subversion.glade
index 00b508c..9e5922e 100644
--- a/plugins/subversion/anjuta-subversion.glade
+++ b/plugins/subversion/anjuta-subversion.glade
@@ -1,89 +1,82 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <requires lib="anjuta"/>
-  <widget class="GtkWindow" id="preferences_subversion">
-    <property name="visible">True</property>
+<interface>
+  <object class="GtkWindow" id="preferences_subversion">
     <property name="title" translatable="yes">Subversion Preferences</property>
     <child>
-      <widget class="GtkFrame" id="subversion">
+      <object class="GtkFrame" id="subversion">
         <property name="visible">True</property>
         <property name="border_width">10</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">GTK_SHADOW_NONE</property>
         <child>
-          <widget class="GtkLabel" id="label32">
+          <object class="GtkLabel" id="label32">
             <property name="visible">True</property>
             <property name="label">TODO!</property>
-          </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">&lt;b&gt;Subversion Options&lt;/b&gt;</property>
             <property name="use_markup">True</property>
-          </widget>
-          <packing>
-            <property name="type">label_item</property>
-          </packing>
+          </object>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_add">
-    <property name="visible">True</property>
+  </object>
+  <object class="GtkDialog" id="subversion_add">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Add file/directory</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">Choose file or directory to add:</property>
                 <property name="use_markup">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox01">
+              <object class="GtkHBox" id="hbox01">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEntry" id="subversion_filename">
+                  <object class="GtkEntry" id="subversion_add_filename">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <property name="width_request">260</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="browse_button_add_dialog">
+                  <object class="GtkButton" id="browse_button_add_dialog">
                     <property name="label" translatable="yes">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -91,208 +84,196 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame9">
+              <object class="GtkFrame" id="frame9">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment9">
+                  <object class="GtkAlignment" id="alignment9">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox19">
+                      <object class="GtkVBox" id="vbox19">
                         <property name="visible">True</property>
                         <property name="border_width">6</property>
                         <child>
-                          <widget class="GtkCheckButton" id="subversion_force">
+                          <object class="GtkCheckButton" id="subversion_force">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Force</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>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="subversion_recurse">
+                          <object class="GtkCheckButton" id="subversion_recurse">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Recurse</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="label33">
+                <child type="label">
+                  <object class="GtkLabel" id="label33">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</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>
           <packing>
             <property name="position">2</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_END</property>
             <child>
-              <widget class="GtkButton" id="cancelbutton1">
+              <object class="GtkButton" id="cancelbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton1">
+              <object class="GtkButton" id="okbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_remove">
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_remove">
     <property name="width_request">550</property>
-    <property name="visible">True</property>
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Remove file/directory</property>
     <property name="resizable">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox2">
+      <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox3">
+          <object class="GtkVBox" id="vbox3">
             <property name="visible">True</property>
             <property name="spacing">2</property>
             <child>
-              <widget class="GtkFrame" id="frame27">
+              <object class="GtkFrame" id="frame27">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox18">
+                  <object class="GtkHBox" id="hbox18">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="spacing">2</property>
                     <child>
-                      <widget class="GtkEntry" id="remove_path_entry">
+                      <object class="GtkEntry" id="remove_path_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="remove_path_browse_button">
+                      <object class="GtkButton" id="remove_path_browse_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Browse...</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>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label4">
+                <child type="label">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;File/URL to Remove:&lt;/b&gt;</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>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame10">
+              <object class="GtkFrame" id="frame10">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment10">
+                  <object class="GtkAlignment" id="alignment10">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkCheckButton" id="subversion_force1">
+                      <object class="GtkCheckButton" id="subversion_force1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Force</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="label34">
+                <child type="label">
+                  <object class="GtkLabel" id="label34">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</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>
@@ -300,18 +281,18 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame25">
+              <object class="GtkFrame" id="frame25">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment25">
+                  <object class="GtkAlignment" id="alignment25">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow7">
+                      <object class="GtkScrolledWindow" id="scrolledwindow7">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -319,128 +300,126 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="GtkTextView" id="remove_log_view">
+                          <object class="GtkTextView" id="remove_log_view">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label44">
+                <child type="label">
+                  <object class="GtkLabel" id="label44">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Log Message:&lt;/b&gt;</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>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button3">
+              <object class="GtkButton" id="button3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_update">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">button3</action-widget>
+      <action-widget response="-5">button2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_update">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Update file/directory</property>
     <property name="resizable">False</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox8">
+      <object class="GtkVBox" id="vbox8">
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox9">
+          <object class="GtkVBox" id="vbox9">
             <property name="visible">True</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkLabel" id="label11">
+              <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">Choose file or directory to update:</property>
                 <property name="use_markup">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox02">
+              <object class="GtkHBox" id="hbox02">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEntry" id="subversion_filename">
+                  <object class="GtkEntry" id="subversion_update_filename">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <property name="width_request">260</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="browse_button_update_dialog">
+                  <object class="GtkButton" id="browse_button_update_dialog">
                     <property name="label" translatable="yes">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -448,14 +427,13 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="subversion_project">
+              <object class="GtkCheckButton" id="subversion_project">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Whole project</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>
@@ -463,16 +441,16 @@
               </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>
                 <child>
-                  <widget class="GtkAlignment" id="alignment3">
+                  <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox10">
+                      <object class="GtkVBox" id="vbox10">
                         <property name="visible">True</property>
                         <child>
                           <placeholder/>
@@ -484,14 +462,13 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="subversion_norecurse">
+                          <object class="GtkCheckButton" id="subversion_update_norecurse">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Do not act recursively</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>
@@ -499,214 +476,206 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox3">
+                          <object class="GtkHBox" id="hbox3">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkLabel" id="label18">
+                              <object class="GtkLabel" id="label18">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Use revision/tag:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="subversion_revision">
+                              <object class="GtkEntry" id="subversion_revision">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">*</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">4</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label12">
+                <child type="label">
+                  <object class="GtkLabel" id="label12">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox3">
+          <object class="GtkHButtonBox" id="hbuttonbox3">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button6">
+              <object class="GtkButton" id="button6">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button7">
+              <object class="GtkButton" id="button7">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_diff">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">button6</action-widget>
+      <action-widget response="-5">button7</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_diff">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Diff file/directory</property>
     <property name="default_width">400</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox21">
+      <object class="GtkVBox" id="vbox21">
         <property name="visible">True</property>
         <property name="spacing">5</property>
         <child>
-          <widget class="GtkVBox" id="vbox22">
+          <object class="GtkVBox" id="vbox22">
             <property name="visible">True</property>
             <property name="spacing">2</property>
             <child>
-              <widget class="GtkFrame" id="frame28">
+              <object class="GtkFrame" id="frame28">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox18">
+                  <object class="GtkVBox" id="vbox18">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox03">
+                      <object class="GtkHBox" id="hbox03">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkEntry" id="diff_path_entry">
+                          <object class="GtkEntry" id="diff_path_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">&#x25CF;</property>
                             <property name="width_request">260</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="browse_button_diff_dialog">
+                          <object class="GtkButton" id="browse_button_diff_dialog">
                             <property name="label" translatable="yes">Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="diff_whole_project_check">
+                      <object class="GtkCheckButton" id="diff_whole_project_check">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Whole project</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>
-                <child>
-                  <widget class="GtkLabel" id="label23">
+                <child type="label">
+                  <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;File or directory to diff:&lt;/b&gt;</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>
               </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>
                 <child>
-                  <widget class="GtkAlignment" id="alignment11">
+                  <object class="GtkAlignment" id="alignment11">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox23">
+                      <object class="GtkVBox" id="vbox23">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkCheckButton" id="diff_save_open_files_check">
+                          <object class="GtkCheckButton" id="diff_save_open_files_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Save open files before diffing</property>
-                            <property name="response_id">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="diff_no_recursive_check">
+                          <object class="GtkCheckButton" id="diff_no_recursive_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Do not act recursively</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>
@@ -714,104 +683,102 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox4">
+                          <object class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkLabel" id="label36">
+                              <object class="GtkLabel" id="label36">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Use revision/tag:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="diff_revision_entry">
+                              <object class="GtkEntry" id="diff_revision_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">*</property>
-                              </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="label37">
+                <child type="label">
+                  <object class="GtkLabel" id="label37">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox4">
+          <object class="GtkHButtonBox" id="hbuttonbox4">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button8">
+              <object class="GtkButton" id="button8">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button9">
+              <object class="GtkButton" id="button9">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="svn_user_auth">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">button8</action-widget>
+      <action-widget response="-5">button9</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="svn_user_auth">
     <property name="title" translatable="yes">Repository authorization</property>
     <property name="default_width">380</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="table1">
+          <object class="GtkTable" id="table1">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="n_rows">4</property>
@@ -822,190 +789,190 @@
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkLabel" id="label38">
+              <object class="GtkLabel" id="label38">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Username:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label39">
+              <object class="GtkLabel" id="label39">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Password:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="remember_pwd">
+              <object class="GtkCheckButton" id="remember_pwd">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Remember Password</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="username_entry">
+              <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">*</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="password_entry">
+              <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visibility">False</property>
                 <property name="invisible_char">*</property>
                 <property name="activates_default">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="auth_realm">
+              <object class="GtkLabel" id="auth_realm">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">realm</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label40">
+              <object class="GtkLabel" id="label40">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Realm:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </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>
             <child>
-              <widget class="GtkButton" id="cancelbutton2">
+              <object class="GtkButton" id="cancelbutton2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton2">
+              <object class="GtkButton" id="okbutton2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="svn_server_trust">
-    <property name="visible">True</property>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton2</action-widget>
+      <action-widget response="-5">okbutton2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="svn_server_trust">
     <property name="title" translatable="yes">Trust server</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkVBox" id="vbox24">
+          <object class="GtkVBox" id="vbox24">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkHBox" id="hbox6">
+              <object class="GtkHBox" id="hbox6">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label43">
+                  <object class="GtkLabel" id="label43">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Realm:</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="realm_label">
+                  <object class="GtkLabel" id="realm_label">
                     <property name="visible">True</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>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="server_info_label">
+              <object class="GtkLabel" id="server_info_label">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -1013,63 +980,64 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="remember_check">
+              <object class="GtkCheckButton" id="remember_check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Remember this decision</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">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="padding">2</property>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button11">
+              <object class="GtkButton" id="button11">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-no</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-9</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button12">
+              <object class="GtkButton" id="button12">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-yes</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-8</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_revert">
+    <action-widgets>
+      <action-widget response="-9">button11</action-widget>
+      <action-widget response="-8">button12</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_revert">
     <property name="width_request">600</property>
     <property name="height_request">400</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1079,28 +1047,28 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox8">
+      <object class="GtkVBox" id="dialog-vbox8">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox6">
+          <object class="GtkVBox" id="vbox6">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkFrame" id="frame1">
+              <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1108,126 +1076,123 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="AnjutaVcsStatusTreeView" id="revert_status_view">
+                          <object class="AnjutaVcsStatusTreeView" id="revert_status_view">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="headers_visible">False</property>
                             <property name="search_column">0</property>
                             <property name="status_codes">ANJUTA_VCS_STATUS_MODIFIED | ANJUTA_VCS_STATUS_ADDED | ANJUTA_VCS_STATUS_DELETED | ANJUTA_VCS_STATUS_CONFLICTED | ANJUTA_VCS_STATUS_MISSING</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label2">
+                <child type="label">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Select Changes to Revert:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkProgressBar" id="revert_status_progress_bar">
+              <object class="GtkProgressBar" id="revert_status_progress_bar">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="text" translatable="yes">Retrieving status...</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHButtonBox" id="hbuttonbox5">
+              <object class="GtkHButtonBox" id="hbuttonbox5">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="spacing">2</property>
                 <property name="layout_style">GTK_BUTTONBOX_START</property>
                 <child>
-                  <widget class="GtkButton" id="revert_select_all_button">
+                  <object class="GtkButton" id="revert_select_all_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-select-all</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="revert_clear_button">
+                  <object class="GtkButton" id="revert_clear_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-clear</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area8">
+          <object class="GtkHButtonBox" id="dialog-action_area8">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="revert_cancel_button">
+              <object class="GtkButton" id="revert_cancel_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="revert_ok_button">
+              <object class="GtkButton" id="revert_ok_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_commit">
+    <action-widgets>
+      <action-widget response="-6">revert_cancel_button</action-widget>
+      <action-widget response="-5">revert_ok_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_commit">
     <property name="width_request">600</property>
     <property name="height_request">400</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1237,28 +1202,28 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox9">
+      <object class="GtkVBox" id="dialog-vbox9">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox4">
+          <object class="GtkVBox" id="vbox4">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkFrame" id="frame2">
+              <object class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment2">
+                  <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1266,82 +1231,75 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="GtkTextView" id="subversion_log_view">
+                          <object class="GtkTextView" id="subversion_log_view">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label3">
+                <child type="label">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Log Message:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame4">
+              <object class="GtkFrame" id="frame4">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment4">
+                  <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkCheckButton" id="subversion_norecurse">
+                      <object class="GtkCheckButton" id="subversion_commit_norecurse">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Do not act recursively</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</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="frame5">
+              <object class="GtkFrame" id="frame5">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment5">
+                  <object class="GtkAlignment" id="alignment5">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                      <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1349,184 +1307,181 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="AnjutaVcsStatusTreeView" id="commit_status_view">
+                          <object class="AnjutaVcsStatusTreeView" id="commit_status_view">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="headers_visible">False</property>
                             <property name="search_column">0</property>
                             <property name="status_codes">ANJUTA_VCS_STATUS_MODIFIED | ANJUTA_VCS_STATUS_ADDED | ANJUTA_VCS_STATUS_DELETED</property>
-                          </widget>
+                          </object>
                         </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Select Files to Commit:&lt;/b&gt;</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>
             <child>
-              <widget class="GtkProgressBar" id="commit_status_progress_bar">
+              <object class="GtkProgressBar" id="commit_status_progress_bar">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="text" translatable="yes">Retrieving status...</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHButtonBox" id="hbuttonbox2">
+              <object class="GtkHButtonBox" id="hbuttonbox2">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="spacing">2</property>
                 <property name="layout_style">GTK_BUTTONBOX_START</property>
                 <child>
-                  <widget class="GtkButton" id="commit_select_all_button">
+                  <object class="GtkButton" id="commit_select_all_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-select-all</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="commit_clear_button">
+                  <object class="GtkButton" id="commit_clear_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-clear</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">4</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area9">
+          <object class="GtkHButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="button1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button4">
+              <object class="GtkButton" id="button4">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkWindow" id="subversion_log">
+    <action-widgets>
+      <action-widget response="-6">button1</action-widget>
+      <action-widget response="-5">button4</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="subversion_log">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
-      <widget class="GtkVBox" id="subversion_log_vbox">
+      <object class="GtkVBox" id="subversion_log_vbox">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
-          <widget class="GtkFrame" id="frame6">
+          <object class="GtkFrame" id="frame6">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment6">
+              <object class="GtkAlignment" id="alignment6">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox7">
+                  <object class="GtkVBox" id="vbox7">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">2</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox04">
+                          <object class="GtkHBox" id="hbox04">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkEntry" id="log_file_entry">
+                              <object class="GtkEntry" id="log_file_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_request">260</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="browse_button_log_dialog">
+                              <object class="GtkButton" id="browse_button_log_dialog">
                                 <property name="label" translatable="yes">Browse...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="log_view_button">
+                          <object class="GtkButton" id="log_view_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_focus">True</property>
@@ -1534,84 +1489,79 @@
                             <property name="has_default">True</property>
                             <property name="receives_default">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="response_id">0</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox2">
+                              <object class="GtkHBox" id="hbox2">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <child>
-                                  <widget class="GtkImage" id="image1">
+                                  <object class="GtkImage" id="image1">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="stock">gtk-find</property>
-                                  </widget>
+                                  </object>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label8">
+                                  <object class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="label" translatable="yes">View Log</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="log_whole_project_check">
+                      <object class="GtkCheckButton" id="log_whole_project_check">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Whole Project</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label9">
+            <child type="label">
+              <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;View the Log for File/Folder:&lt;/b&gt;</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>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame7">
+          <object class="GtkFrame" id="frame7">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment7">
+              <object class="GtkAlignment" id="alignment7">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow4">
+                  <object class="GtkScrolledWindow" id="scrolledwindow4">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1619,46 +1569,43 @@
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="log_changes_view">
+                      <object class="GtkTreeView" id="log_changes_view">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="headers_clickable">True</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label10">
+            <child type="label">
+              <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;Changes:&lt;/b&gt;</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="frame8">
+          <object class="GtkFrame" id="frame8">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment8">
+              <object class="GtkAlignment" id="alignment8">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
+                  <object class="GtkScrolledWindow" id="scrolledwindow5">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1666,107 +1613,102 @@
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTextView" id="log_message_text">
+                      <object class="GtkTextView" id="log_message_text">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="editable">False</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label13">
+            <child type="label">
+              <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;Log Message:&lt;/b&gt;</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>
         <child>
-          <widget class="GtkHBox" id="hbox5">
+          <object class="GtkHBox" id="hbox5">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">2</property>
             <child>
-              <widget class="GtkButton" id="log_diff_previous_button">
+              <object class="GtkButton" id="log_diff_previous_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox7">
+                  <object class="GtkHBox" id="hbox7">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkImage" id="image2">
+                      <object class="GtkImage" id="image2">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="stock">gtk-zoom-100</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label14">
+                      <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Diff to Previous</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="log_diff_selected_button">
+              <object class="GtkButton" id="log_diff_selected_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox8">
+                  <object class="GtkHBox" id="hbox8">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkImage" id="image3">
+                      <object class="GtkImage" id="image3">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="stock">gtk-zoom-fit</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label15">
+                      <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Diff Selected Revisions</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -1774,54 +1716,53 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="log_view_selected_button">
+              <object class="GtkButton" id="log_view_selected_button">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox9">
+                  <object class="GtkHBox" id="hbox9">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkImage" id="image4">
+                      <object class="GtkImage" id="image4">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="stock">gtk-find</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label16">
+                      <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">View Selected Revision</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </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="expand">False</property>
             <property name="fill">False</property>
             <property name="position">3</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_copy">
+  </object>
+  <object class="GtkDialog" id="subversion_copy">
     <property name="width_request">550</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
@@ -1831,165 +1772,159 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox10">
+      <object class="GtkVBox" id="dialog-vbox10">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox5">
+          <object class="GtkVBox" id="vbox5">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <widget class="GtkFrame" id="frame12">
+              <object class="GtkFrame" id="frame12">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment12">
+                  <object class="GtkAlignment" id="alignment12">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox11">
+                      <object class="GtkVBox" id="vbox11">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">4</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox10">
+                          <object class="GtkHBox" id="hbox10">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">2</property>
                             <child>
-                              <widget class="GtkLabel" id="label19">
+                              <object class="GtkLabel" id="label19">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Source:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="copy_source_entry">
+                              <object class="GtkEntry" id="copy_source_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="copy_browse_button">
+                              <object class="GtkButton" id="copy_browse_button">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Browse...</property>
-                                <property name="response_id">0</property>
-                              </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="expand">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox11">
+                          <object class="GtkHBox" id="hbox11">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">2</property>
                             <child>
-                              <widget class="GtkLabel" id="label20">
+                              <object class="GtkLabel" id="label20">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Destination:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="copy_dest_entry">
+                              <object class="GtkEntry" id="copy_dest_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </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">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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Source/Destination Paths:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame13">
+              <object class="GtkFrame" id="frame13">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment13">
+                  <object class="GtkAlignment" id="alignment13">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox12">
+                      <object class="GtkVBox" id="vbox12">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkRadioButton" id="copy_working_copy_radio">
+                          <object class="GtkRadioButton" id="copy_working_copy_radio">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Working Copy</property>
-                            <property name="response_id">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="copy_repository_head_radio">
+                          <object class="GtkRadioButton" id="copy_repository_head_radio">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Repository Head</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">copy_other_revision_radio</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -1997,77 +1932,73 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox12">
+                          <object class="GtkHBox" id="hbox12">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">2</property>
                             <child>
-                              <widget class="GtkRadioButton" id="copy_other_revision_radio">
+                              <object class="GtkRadioButton" id="copy_other_revision_radio">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Other Revision:</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">copy_working_copy_radio</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="copy_revision_entry">
+                              <object class="GtkEntry" id="copy_revision_entry">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">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">2</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label21">
+                <child type="label">
+                  <object class="GtkLabel" id="label21">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Revision:&lt;/b&gt;</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="frame14">
+              <object class="GtkFrame" id="frame14">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment14">
+                  <object class="GtkAlignment" id="alignment14">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow6">
+                      <object class="GtkScrolledWindow" id="scrolledwindow6">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2075,77 +2006,76 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="GtkTextView" id="copy_log_view">
+                          <object class="GtkTextView" id="copy_log_view">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                         </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Log Message:&lt;/b&gt;</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>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area10">
+          <object class="GtkHButtonBox" id="dialog-action_area10">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button10">
+              <object class="GtkButton" id="button10">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button5">
+              <object class="GtkButton" id="button5">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_switch">
+    <action-widgets>
+      <action-widget response="-6">button10</action-widget>
+      <action-widget response="-5">button5</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_switch">
     <property name="width_request">500</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
@@ -2155,281 +2085,268 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox11">
+      <object class="GtkVBox" id="dialog-vbox11">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox13">
+          <object class="GtkVBox" id="vbox13">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <widget class="GtkFrame" id="frame15">
+              <object class="GtkFrame" id="frame15">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment15">
+                  <object class="GtkAlignment" id="alignment15">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox05">
+                      <object class="GtkHBox" id="hbox05">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkEntry" id="switch_working_copy_entry">
+                          <object class="GtkEntry" id="switch_working_copy_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">&#x25CF;</property>
                             <property name="width_request">260</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="browse_button_switch_dialog">
+                          <object class="GtkButton" id="browse_button_switch_dialog">
                             <property name="label" translatable="yes">Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                          </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="label24">
+                <child type="label">
+                  <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Working Copy Path:&lt;/b&gt;</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>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame16">
+              <object class="GtkFrame" id="frame16">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment16">
+                  <object class="GtkAlignment" id="alignment16">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkEntry" id="switch_url_entry">
+                      <object class="GtkEntry" id="switch_url_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Branch/Tag URL:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame17">
+              <object class="GtkFrame" id="frame17">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment17">
+                  <object class="GtkAlignment" id="alignment17">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox14">
+                      <object class="GtkVBox" id="vbox14">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkRadioButton" id="switch_head_revision_radio">
+                          <object class="GtkRadioButton" id="switch_head_revision_radio">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Repository Head</property>
-                            <property name="response_id">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox14">
+                          <object class="GtkHBox" id="hbox14">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <widget class="GtkRadioButton" id="switch_other_revision_radio">
+                              <object class="GtkRadioButton" id="switch_other_revision_radio">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Other Revision:</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">switch_head_revision_radio</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="switch_revision_entry">
+                              <object class="GtkEntry" id="switch_revision_entry">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </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">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label26">
+                <child type="label">
+                  <object class="GtkLabel" id="label26">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Revision:&lt;/b&gt;</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>
             <child>
-              <widget class="GtkFrame" id="frame18">
+              <object class="GtkFrame" id="frame18">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment18">
+                  <object class="GtkAlignment" id="alignment18">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkCheckButton" id="switch_no_recursive_check">
+                      <object class="GtkCheckButton" id="switch_no_recursive_check">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Do not act recursively</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
-                      </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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area11">
+          <object class="GtkHButtonBox" id="dialog-action_area11">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button13">
+              <object class="GtkButton" id="button13">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button14">
+              <object class="GtkButton" id="button14">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_merge">
+    <action-widgets>
+      <action-widget response="-6">button13</action-widget>
+      <action-widget response="-5">button14</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_merge">
     <property name="width_request">550</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
@@ -2439,145 +2356,136 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox12">
+      <object class="GtkVBox" id="dialog-vbox12">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox15">
+          <object class="GtkVBox" id="vbox15">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <widget class="GtkFrame" id="frame19">
+              <object class="GtkFrame" id="frame19">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment19">
+                  <object class="GtkAlignment" id="alignment19">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox15">
+                      <object class="GtkHBox" id="hbox15">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">2</property>
                         <child>
-                          <widget class="GtkEntry" id="merge_first_path_entry">
+                          <object class="GtkEntry" id="merge_first_path_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="merge_first_path_browse_button">
+                          <object class="GtkButton" id="merge_first_path_browse_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Browse...</property>
-                            <property name="response_id">0</property>
-                          </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="label28">
+                <child type="label">
+                  <object class="GtkLabel" id="label28">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;First Path:&lt;/b&gt;</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>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame20">
+              <object class="GtkFrame" id="frame20">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment20">
+                  <object class="GtkAlignment" id="alignment20">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox16">
+                      <object class="GtkVBox" id="vbox16">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox16">
+                          <object class="GtkHBox" id="hbox16">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">2</property>
                             <child>
-                              <widget class="GtkEntry" id="merge_second_path_entry">
+                              <object class="GtkEntry" id="merge_second_path_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
+                              </object>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="merge_second_path_browse_button">
+                              <object class="GtkButton" id="merge_second_path_browse_button">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Browse...</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>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="merge_use_first_path_check">
+                          <object class="GtkCheckButton" id="merge_use_first_path_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Use first path</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label29">
+                <child type="label">
+                  <object class="GtkLabel" id="label29">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Second Path:&lt;/b&gt;</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>
@@ -2585,142 +2493,134 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame24">
+              <object class="GtkFrame" id="frame24">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment24">
+                  <object class="GtkAlignment" id="alignment24">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox06">
+                      <object class="GtkHBox" id="hbox06">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkEntry" id="merge_working_copy_path_entry">
+                          <object class="GtkEntry" id="merge_working_copy_path_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">&#x25CF;</property>
                             <property name="width_request">260</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="browse_button_merge_dialog">
+                          <object class="GtkButton" id="browse_button_merge_dialog">
                             <property name="label" translatable="yes">Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                          </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="label42">
+                <child type="label">
+                  <object class="GtkLabel" id="label42">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Working Copy Path:&lt;/b&gt;</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>
             <child>
-              <widget class="GtkFrame" id="frame21">
+              <object class="GtkFrame" id="frame21">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment21">
+                  <object class="GtkAlignment" id="alignment21">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox17">
+                      <object class="GtkVBox" id="vbox17">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox17">
+                          <object class="GtkHBox" id="hbox17">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">2</property>
                             <child>
-                              <widget class="GtkRadioButton" id="merge_start_revision_radio">
+                              <object class="GtkRadioButton" id="merge_start_revision_radio">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Revision:</property>
-                                <property name="response_id">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="merge_start_revision_entry">
+                              <object class="GtkEntry" id="merge_start_revision_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="merge_start_head_radio">
+                          <object class="GtkRadioButton" id="merge_start_head_radio">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Repository Head</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">merge_start_revision_radio</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label30">
+                <child type="label">
+                  <object class="GtkLabel" id="label30">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Start Revision:&lt;/b&gt;</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>
@@ -2728,90 +2628,85 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame22">
+              <object class="GtkFrame" id="frame22">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment22">
+                  <object class="GtkAlignment" id="alignment22">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox25">
+                      <object class="GtkVBox" id="vbox25">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox19">
+                          <object class="GtkHBox" id="hbox19">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">2</property>
                             <child>
-                              <widget class="GtkRadioButton" id="merge_end_revision_radio">
+                              <object class="GtkRadioButton" id="merge_end_revision_radio">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Revision:</property>
-                                <property name="response_id">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="merge_end_revision_entry">
+                              <object class="GtkEntry" id="merge_end_revision_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </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>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="merge_end_head_radio">
+                          <object class="GtkRadioButton" id="merge_end_head_radio">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Repository Head</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">merge_end_revision_radio</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="label31">
+                <child type="label">
+                  <object class="GtkLabel" id="label31">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;End Revision:&lt;/b&gt;</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>
@@ -2819,134 +2714,129 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame23">
+              <object class="GtkFrame" id="frame23">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment23">
+                  <object class="GtkAlignment" id="alignment23">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vbox26">
+                      <object class="GtkVBox" id="vbox26">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkCheckButton" id="merge_no_recursive_check">
+                          <object class="GtkCheckButton" id="merge_no_recursive_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Do not act recursively</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="merge_ignore_ancestry_check">
+                          <object class="GtkCheckButton" id="merge_ignore_ancestry_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Ignore ancestry</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="GtkCheckButton" id="merge_force_check">
+                          <object class="GtkCheckButton" id="merge_force_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Force</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="merge_dry_run_check">
+                          <object class="GtkCheckButton" id="merge_dry_run_check">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Dry run</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">3</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label41">
+                <child type="label">
+                  <object class="GtkLabel" id="label41">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Options:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">5</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area12">
+          <object class="GtkHButtonBox" id="dialog-action_area12">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button15">
+              <object class="GtkButton" id="button15">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button16">
+              <object class="GtkButton" id="button16">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="subversion_resolve">
+    <action-widgets>
+      <action-widget response="-6">button15</action-widget>
+      <action-widget response="-5">button16</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="subversion_resolve">
     <property name="width_request">600</property>
     <property name="height_request">400</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2956,28 +2846,28 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox14">
+      <object class="GtkVBox" id="dialog-vbox14">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-          <widget class="GtkVBox" id="vbox27">
+          <object class="GtkVBox" id="vbox27">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">5</property>
             <child>
-              <widget class="GtkFrame" id="frame26">
+              <object class="GtkFrame" id="frame26">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment26">
+                  <object class="GtkAlignment" id="alignment26">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                      <object class="GtkScrolledWindow" id="scrolledwindow8">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2985,7 +2875,7 @@
                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                         <property name="shadow_type">GTK_SHADOW_IN</property>
                         <child>
-                          <widget class="AnjutaVcsStatusTreeView" id="resolve_status_view">
+                          <object class="AnjutaVcsStatusTreeView" id="resolve_status_view">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2993,117 +2883,114 @@
                             <property name="search_column">0</property>
                             <property name="status_codes">ANJUTA_VCS_STATUS_CONFLICTED</property>
                             <property name="show_status">False</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label45">
+                <child type="label">
+                  <object class="GtkLabel" id="label45">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Select Files to Mark as Resolved:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkProgressBar" id="resolve_status_progress_bar">
+              <object class="GtkProgressBar" id="resolve_status_progress_bar">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="activity_mode">True</property>
                 <property name="show_text">True</property>
                 <property name="text" translatable="yes">Retrieving status...</property>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHButtonBox" id="hbuttonbox7">
+              <object class="GtkHButtonBox" id="hbuttonbox7">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="spacing">2</property>
                 <property name="layout_style">GTK_BUTTONBOX_START</property>
                 <child>
-                  <widget class="GtkButton" id="resolve_select_all_button">
+                  <object class="GtkButton" id="resolve_select_all_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-select-all</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="resolve_clear_button">
+                  <object class="GtkButton" id="resolve_clear_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">gtk-clear</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area14">
+          <object class="GtkHButtonBox" id="dialog-action_area14">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="revert_cancel_button2">
+              <object class="GtkButton" id="revert_cancel_button2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="revert_ok_button2">
+              <object class="GtkButton" id="revert_ok_button2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-6">revert_cancel_button2</action-widget>
+      <action-widget response="-5">revert_ok_button2</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/subversion/plugin.c b/plugins/subversion/plugin.c
index b22937c..ad09a43 100644
--- a/plugins/subversion/plugin.c
+++ b/plugins/subversion/plugin.c
@@ -343,7 +343,7 @@ value_added_project_root_uri (AnjutaPlugin *plugin, const gchar *name,
 		if (bb_plugin->project_root_dir)
 		{
 			// update_project_ui (bb_plugin);
-			subversion_log_set_whole_project_sensitive (bb_plugin->log_gxml,
+			subversion_log_set_whole_project_sensitive (bb_plugin->log_bxml,
 														TRUE);
 			gtk_action_set_sensitive (commit_action, TRUE);
 			gtk_action_set_sensitive (revert_action, TRUE);
@@ -382,7 +382,7 @@ value_removed_project_root_uri (AnjutaPlugin *plugin, const gchar *name,
 	bb_plugin->project_root_dir = NULL;
 	// update_project_ui (bb_plugin);
 	
-	subversion_log_set_whole_project_sensitive (bb_plugin->log_gxml,
+	subversion_log_set_whole_project_sensitive (bb_plugin->log_bxml,
 												FALSE);
 	gtk_action_set_sensitive (commit_action, FALSE);
 	gtk_action_set_sensitive (revert_action, FALSE);
@@ -442,6 +442,7 @@ activate_plugin (AnjutaPlugin *plugin)
 	GtkAction *commit_action;
 	GtkAction *revert_action;
 	GtkAction *resolve_action;
+	GError* error = NULL;
 	
 	DEBUG_PRINT ("%s", "Subversion: Activating Subversion plugin ...");
 	subversion = ANJUTA_PLUGIN_SUBVERSION (plugin);
@@ -465,9 +466,13 @@ activate_plugin (AnjutaPlugin *plugin)
 	/* Merge UI */
 	subversion->uiid = anjuta_ui_merge (ui, UI_FILE);
 	
-	subversion->log_gxml = glade_xml_new (GLADE_FILE, "subversion_log", 
-										  NULL);
-	
+	subversion->log_bxml = gtk_builder_new ();
+	if (!gtk_builder_add_from_file (subversion->log_bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
 	/* Add watches */
 	subversion->fm_watch_id = 
 		anjuta_plugin_add_watch (plugin, IANJUTA_FILE_MANAGER_SELECTED_FILE,
@@ -532,7 +537,7 @@ deactivate_plugin (AnjutaPlugin *plugin)
 								ANJUTA_PLUGIN_SUBVERSION (plugin)->log_viewer,
 								NULL);
 	
-	g_object_unref (ANJUTA_PLUGIN_SUBVERSION (plugin)->log_gxml);
+	g_object_unref (ANJUTA_PLUGIN_SUBVERSION (plugin)->log_bxml);
 	
 	return TRUE;
 }
@@ -561,7 +566,7 @@ subversion_instance_init (GObject *obj)
 	plugin->fm_current_filename = NULL;
 	plugin->project_root_dir = NULL;
 	plugin->current_editor_filename = NULL;
-	plugin->log_gxml = NULL;
+	plugin->log_bxml = NULL;
 	plugin->log_viewer = NULL;
 	
 	apr_initialize ();
diff --git a/plugins/subversion/plugin.h b/plugins/subversion/plugin.h
index ad76c03..a4df0f2 100644
--- a/plugins/subversion/plugin.h
+++ b/plugins/subversion/plugin.h
@@ -66,7 +66,7 @@ struct _Subversion{
 	gchar *current_editor_filename;
 	
 	/* Log viewer */
-	GladeXML *log_gxml;
+	GtkBuilder *log_bxml;
 	GtkWidget *log_viewer;
 };
 
diff --git a/plugins/subversion/subversion-add-dialog.c b/plugins/subversion/subversion-add-dialog.c
index 08c1cf0..77492a2 100644
--- a/plugins/subversion/subversion-add-dialog.c
+++ b/plugins/subversion/subversion-add-dialog.c
@@ -54,9 +54,9 @@ on_subversion_add_response(GtkDialog* dialog, gint response, SubversionData* dat
 	{
 		case GTK_RESPONSE_OK:
 		{
-			GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "subversion_filename");
-			GtkWidget* force = glade_xml_get_widget(data->gxml, "subversion_force");
-			GtkWidget* recurse = glade_xml_get_widget(data->gxml, "subversion_recurse");
+			GtkWidget* fileentry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_add_filename"));
+			GtkWidget* force = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_force"));
+			GtkWidget* recurse = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_recurse"));
 			
 			const gchar* filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
 			SvnAddCommand *add_command;
@@ -92,23 +92,29 @@ on_subversion_add_response(GtkDialog* dialog, gint response, SubversionData* dat
 static void
 subversion_add_dialog(GtkAction* action, Subversion* plugin, gchar *filename)
 {
-	GladeXML* gxml;
+	GtkBuilder* bxml = gtk_builder_new ();
 	GtkWidget* dialog; 
 	GtkWidget* fileentry;
 	GtkWidget* button;
 	SubversionData* data;
-	gxml = glade_xml_new(GLADE_FILE, "subversion_add", NULL);
-	
-	dialog = glade_xml_get_widget(gxml, "subversion_add");
-	fileentry = glade_xml_get_widget(gxml, "subversion_filename");
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_add"));
+	fileentry = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_add_filename"));
 	if (filename)
 		gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
 
-	button = glade_xml_get_widget(gxml, BROWSE_BUTTON_ADD_DIALOG);
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, BROWSE_BUTTON_ADD_DIALOG));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 		G_CALLBACK(on_subversion_browse_button_clicked), fileentry);
 
-	data = subversion_data_new(plugin, gxml);
+	data = subversion_data_new(plugin, bxml);
 	g_signal_connect(G_OBJECT(dialog), "response", 
 		G_CALLBACK(on_subversion_add_response), data);
 	
diff --git a/plugins/subversion/subversion-commit-dialog.c b/plugins/subversion/subversion-commit-dialog.c
index b32136a..5722920 100644
--- a/plugins/subversion/subversion-commit-dialog.c
+++ b/plugins/subversion/subversion-commit-dialog.c
@@ -59,7 +59,7 @@ on_subversion_commit_response(GtkDialog* dialog, gint response,
 			SvnCommitCommand *commit_command;
 			guint pulse_timer_id;
 			
-			logtext = glade_xml_get_widget(data->gxml, "subversion_log_view");
+			logtext = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_log_view"));
 			log = get_log_from_textview(logtext);
 			if (!g_utf8_strlen(log, -1))
 			{
@@ -74,10 +74,10 @@ on_subversion_commit_response(GtkDialog* dialog, gint response,
 					break;
 			}
 			
-			norecurse = glade_xml_get_widget(data->gxml, "subversion_norecurse");
+			norecurse = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_commit_norecurse"));
 			
-			commit_status_view = glade_xml_get_widget (data->gxml, 
-													   "commit_status_view");
+			commit_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													   "commit_status_view"));
 			
 			selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (commit_status_view));
 
@@ -133,7 +133,7 @@ static void
 subversion_commit_dialog (GtkAction* action, Subversion* plugin, 
 						  gchar *filename)
 {
-	GladeXML* gxml;
+	GtkBuilder* bxml = gtk_builder_new ();
 	GtkWidget* dialog; 
 	GtkWidget *commit_select_all_button;
 	GtkWidget *commit_clear_button;
@@ -141,17 +141,22 @@ subversion_commit_dialog (GtkAction* action, Subversion* plugin,
 	GtkWidget *commit_status_progress_bar;
 	SvnStatusCommand *status_command;
 	SubversionData* data;
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
 	
-	gxml = glade_xml_new(GLADE_FILE, "subversion_commit", NULL);
-	
-	dialog = glade_xml_get_widget(gxml, "subversion_commit");
-	commit_select_all_button = glade_xml_get_widget (gxml, 
-													 "commit_select_all_button");
-	commit_clear_button = glade_xml_get_widget (gxml,
-												"commit_clear_button");
-	commit_status_view = glade_xml_get_widget (gxml, "commit_status_view");
-	commit_status_progress_bar = glade_xml_get_widget (gxml,
-													   "commit_status_progress_bar");
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_commit"));
+	commit_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml, 
+													 "commit_select_all_button"));
+	commit_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+												"commit_clear_button"));
+	commit_status_view = GTK_WIDGET (gtk_builder_get_object (bxml, "commit_status_view"));
+	commit_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml,
+													   "commit_status_progress_bar"));
 	
 	status_command = svn_status_command_new (plugin->project_root_dir, 
 											 TRUE, TRUE);
@@ -192,7 +197,7 @@ subversion_commit_dialog (GtkAction* action, Subversion* plugin,
 	
 	anjuta_command_start (ANJUTA_COMMAND (status_command));
 	
-	data = subversion_data_new(plugin, gxml);
+	data = subversion_data_new(plugin, bxml);
 	g_signal_connect(G_OBJECT(dialog), "response", 
 		G_CALLBACK(on_subversion_commit_response), data);
 	
diff --git a/plugins/subversion/subversion-copy-dialog.c b/plugins/subversion/subversion-copy-dialog.c
index 682aaa4..c14a827 100644
--- a/plugins/subversion/subversion-copy-dialog.c
+++ b/plugins/subversion/subversion-copy-dialog.c
@@ -32,10 +32,10 @@ on_copy_other_revision_radio_toggled (GtkToggleButton *toggle_button,
 	GtkWidget *subversion_copy;
 	gboolean active;
 	
-	copy_revision_entry = glade_xml_get_widget (data->gxml, 
-												"copy_revision_entry");
-	subversion_copy = glade_xml_get_widget (data->gxml,
-											"subversion_copy");
+	copy_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+												"copy_revision_entry"));
+	subversion_copy = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+											"subversion_copy"));
 	active = gtk_toggle_button_get_active (toggle_button);
 	gtk_widget_set_sensitive (copy_revision_entry, active);
 	
@@ -55,8 +55,8 @@ on_copy_browse_button_clicked (GtkButton *button, SubversionData *data)
 	GtkWidget *file_chooser_dialog;
 	gchar *selected_path;
 	
-	subversion_copy = glade_xml_get_widget (data->gxml, "subversion_copy");
-	copy_source_entry = glade_xml_get_widget (data->gxml, "copy_source_entry");
+	subversion_copy = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_copy"));
+	copy_source_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "copy_source_entry"));
 	file_chooser_dialog = gtk_file_chooser_dialog_new ("Select file or folder",
 													   GTK_WINDOW (subversion_copy),
 													   GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -90,8 +90,8 @@ on_copy_dest_entry_focus_in (GtkWidget *widget, GdkEventFocus *event,
 	gchar *source_path_parent;
 	gchar *suggested_path;  /* source_path_parent with a slash (/) after it */
 	
-	copy_source_entry = glade_xml_get_widget (data->gxml, "copy_source_entry");
-	copy_dest_entry = glade_xml_get_widget (data->gxml, "copy_dest_entry");
+	copy_source_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "copy_source_entry"));
+	copy_dest_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "copy_dest_entry"));
 	source_path = gtk_editable_get_chars (GTK_EDITABLE (copy_source_entry), 0, 
 										  -1);
 	dest_path = gtk_editable_get_chars (GTK_EDITABLE (copy_dest_entry), 0, 
@@ -162,18 +162,18 @@ on_subversion_copy_response (GtkDialog *dialog, gint response,
 	
 	if (response == GTK_RESPONSE_OK)
 	{
-		copy_source_entry = glade_xml_get_widget (data->gxml, 
-												  "copy_source_entry");
-		copy_dest_entry = glade_xml_get_widget (data->gxml,
-												"copy_dest_entry");
-		copy_working_copy_radio = glade_xml_get_widget (data->gxml,
-														"copy_working_copy_radio");
-		copy_repository_head_radio = glade_xml_get_widget (data->gxml,
-														   "copy_repository_head_radio");
-		copy_other_revision_radio = glade_xml_get_widget (data->gxml,
-														  "copy_other_revision_radio");
-		copy_log_view = glade_xml_get_widget (data->gxml,
-											  "copy_log_view");
+		copy_source_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+												  "copy_source_entry"));
+		copy_dest_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+												"copy_dest_entry"));
+		copy_working_copy_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														"copy_working_copy_radio"));
+		copy_repository_head_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														   "copy_repository_head_radio"));
+		copy_other_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														  "copy_other_revision_radio"));
+		copy_log_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+											  "copy_log_view"));
 		
 		source_path = gtk_editable_get_chars (GTK_EDITABLE (copy_source_entry),
 											  0, -1);
@@ -200,8 +200,8 @@ on_subversion_copy_response (GtkDialog *dialog, gint response,
 		
 		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (copy_other_revision_radio)))
 		{
-			copy_revision_entry = glade_xml_get_widget (data->gxml, 
-														"copy_revision_entry");
+			copy_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+														"copy_revision_entry"));
 			
 			if (!check_input (GTK_WIDGET (dialog), copy_revision_entry,
 						  	  _("Please enter a revision.")))
@@ -241,23 +241,29 @@ on_subversion_copy_response (GtkDialog *dialog, gint response,
 static void
 subversion_copy_dialog (GtkAction *action, Subversion *plugin, gchar *filename)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *subversion_copy;
 	GtkWidget *copy_source_entry;
 	GtkWidget *copy_dest_entry;
 	GtkWidget *copy_browse_button;
 	GtkWidget *copy_other_revision_radio;
 	SubversionData *data;
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	subversion_copy = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_copy"));
+	copy_source_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "copy_source_entry"));
+	copy_dest_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "copy_dest_entry"));
+	copy_browse_button = GTK_WIDGET (gtk_builder_get_object (bxml, "copy_browse_button"));
+	copy_other_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+													  "copy_other_revision_radio"));
 	
-	gxml = glade_xml_new (GLADE_FILE, "subversion_copy", NULL);
-	subversion_copy = glade_xml_get_widget (gxml, "subversion_copy");
-	copy_source_entry = glade_xml_get_widget (gxml, "copy_source_entry");
-	copy_dest_entry = glade_xml_get_widget (gxml, "copy_dest_entry");
-	copy_browse_button = glade_xml_get_widget (gxml, "copy_browse_button");
-	copy_other_revision_radio = glade_xml_get_widget (gxml,
-													  "copy_other_revision_radio");
-	
-	data = subversion_data_new (plugin, gxml);
+	data = subversion_data_new (plugin, bxml);
 	
 	g_signal_connect (G_OBJECT (subversion_copy), "response",
 					  G_CALLBACK (on_subversion_copy_response),
diff --git a/plugins/subversion/subversion-diff-dialog.c b/plugins/subversion/subversion-diff-dialog.c
index 0e4b304..bfa3140 100644
--- a/plugins/subversion/subversion-diff-dialog.c
+++ b/plugins/subversion/subversion-diff-dialog.c
@@ -100,14 +100,14 @@ on_subversion_diff_response(GtkDialog* dialog, gint response, SubversionData* da
 	{
 		case GTK_RESPONSE_OK:
 		{
-			diff_path_entry = glade_xml_get_widget (data->gxml, 
-													"diff_path_entry");
-			diff_no_recursive_check = glade_xml_get_widget (data->gxml, 
-															"diff_no_recursive_check");
-			diff_revision_entry = glade_xml_get_widget (data->gxml, 
-														"diff_revision_entry");
-			diff_save_open_files_check = glade_xml_get_widget (data->gxml,
-															   "diff_save_open_files_check");
+			diff_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													"diff_path_entry"));
+			diff_no_recursive_check = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+															"diff_no_recursive_check"));
+			diff_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+														"diff_revision_entry"));
+			diff_save_open_files_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+															   "diff_save_open_files_check"));
 			path = g_strdup (gtk_entry_get_text (GTK_ENTRY (diff_path_entry)));
 			revision_text = gtk_entry_get_text (GTK_ENTRY (diff_revision_entry));
 			revision = atol (revision_text);
@@ -139,19 +139,25 @@ on_subversion_diff_response(GtkDialog* dialog, gint response, SubversionData* da
 static void
 subversion_diff_dialog (GtkAction *action, Subversion *plugin, gchar *filename)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *subversion_diff; 
 	GtkWidget *diff_path_entry;
 	GtkWidget *diff_whole_project_check;
 	GtkWidget *button;
 	SubversionData *data;
-	
-	gxml = glade_xml_new (GLADE_FILE, "subversion_diff", NULL);
-	subversion_diff = glade_xml_get_widget(gxml, "subversion_diff");
-	diff_path_entry = glade_xml_get_widget(gxml, "diff_path_entry");
-	diff_whole_project_check = glade_xml_get_widget(gxml, 
-													"diff_whole_project_check");
-	data = subversion_data_new (plugin, gxml);
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	subversion_diff = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_diff"));
+	diff_path_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "diff_path_entry"));
+	diff_whole_project_check = GTK_WIDGET (gtk_builder_get_object (bxml, 
+													"diff_whole_project_check"));
+	data = subversion_data_new (plugin, bxml);
 	
 	g_object_set_data (G_OBJECT (diff_whole_project_check), "fileentry", 
 					   diff_path_entry);
@@ -165,7 +171,7 @@ subversion_diff_dialog (GtkAction *action, Subversion *plugin, gchar *filename)
 					 plugin);
 	init_whole_project (plugin, diff_whole_project_check, !filename);
 
-	button = glade_xml_get_widget(gxml, BROWSE_BUTTON_DIFF_DIALOG);
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, BROWSE_BUTTON_DIFF_DIALOG));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 		G_CALLBACK(on_subversion_browse_button_clicked), diff_path_entry);
 
diff --git a/plugins/subversion/subversion-log-dialog.c b/plugins/subversion/subversion-log-dialog.c
index 5ac30d8..c3bea3a 100644
--- a/plugins/subversion/subversion-log-dialog.c
+++ b/plugins/subversion/subversion-log-dialog.c
@@ -34,7 +34,7 @@ typedef struct
 
 typedef struct
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml;
 	Subversion *plugin;
 	gchar *path;
 	GtkListStore *log_store;
@@ -69,8 +69,8 @@ on_diff_selected_column_toggled (GtkCellRendererToggle *renderer,
 						COL_REVISION, &revision,
 						-1);
 	
-	log_diff_selected_button = glade_xml_get_widget (data->gxml,
-													 "log_diff_selected_button");
+	log_diff_selected_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													 "log_diff_selected_button"));
 		
 	selected = !selected;
 		
@@ -110,7 +110,7 @@ create_columns (LogData *data)
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	
-	log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+	log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
 	
 	/* Selected for diff  */
 	column = gtk_tree_view_column_new ();
@@ -179,7 +179,7 @@ on_log_command_finished (AnjutaCommand *command, guint return_code,
 	gchar *full_log;
 		
 	g_object_ref (data->log_store);
-	log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+	log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
 	gtk_tree_view_set_model (GTK_TREE_VIEW (log_changes_view), NULL);
 	g_hash_table_remove_all (data->selected_diff_revisions);
 	
@@ -233,14 +233,14 @@ subversion_show_log (LogData *data)
 	SvnLogCommand *log_command;
 	guint pulse_timer_id;
 	
-	log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
-	log_file_entry = glade_xml_get_widget (data->gxml, "log_file_entry");
-	log_diff_previous_button = glade_xml_get_widget (data->gxml,
-													 "log_diff_previous_button");
-	log_diff_selected_button = glade_xml_get_widget (data->gxml,
-													 "log_diff_selected_button");
-	log_view_selected_button = glade_xml_get_widget (data->gxml,
-													 "log_view_selected_button");
+	log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
+	log_file_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_file_entry"));
+	log_diff_previous_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													 "log_diff_previous_button"));
+	log_diff_selected_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													 "log_diff_selected_button"));
+	log_view_selected_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													 "log_view_selected_button"));
 	path = gtk_entry_get_text (GTK_ENTRY (log_file_entry));
 	
 	if (data->path)
@@ -328,7 +328,7 @@ on_log_view_selected_button_clicked (GtkButton *button, LogData *data)
 	IAnjutaEditor *editor;
 	guint pulse_timer_id;
 	
-	log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+	log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (log_changes_view));
 	gtk_tree_selection_get_selected (selection, &log_store, &selected_iter);
 	
@@ -464,7 +464,7 @@ on_log_diff_previous_button_clicked (GtkButton *button, LogData *data)
 	IAnjutaEditor *editor;
 	guint pulse_timer_id;
 	
-	log_changes_view = glade_xml_get_widget (data->gxml, "log_changes_view");
+	log_changes_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_changes_view"));
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (log_changes_view));
 	gtk_tree_selection_get_selected (selection, &log_store, &selected_iter);
 	
@@ -535,11 +535,11 @@ on_log_changes_view_row_selected (GtkTreeSelection *selection,
 	gchar *log_message;
 	
 	gtk_tree_model_get_iter (model, &iter, path);
-	log_message_text = glade_xml_get_widget (data->gxml, "log_message_text");
-	log_diff_previous_button = glade_xml_get_widget (data->gxml, 
-													 "log_diff_previous_button");
-	log_view_selected_button = glade_xml_get_widget (data->gxml,
-													 "log_view_selected_button");
+	log_message_text = GTK_WIDGET (gtk_builder_get_object (data->bxml, "log_message_text"));
+	log_diff_previous_button = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													 "log_diff_previous_button"));
+	log_view_selected_button = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													 "log_view_selected_button"));
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (log_message_text));
 	gtk_tree_model_get (model, &iter, 
 						COL_FULL_LOG, &log_message,
@@ -576,26 +576,26 @@ subversion_log_window_create (Subversion *plugin)
 	GtkTreeSelection *selection;
 	
 	data = g_new0 (LogData, 1);
-	data->gxml = plugin->log_gxml;
+	data->bxml = plugin->log_bxml;
 	data->selected_diff_revisions = g_hash_table_new (g_direct_hash, 
 													  g_direct_equal);
 	data->plugin = plugin;
 	data->path = NULL;
 	
-	subversion_log = glade_xml_get_widget (plugin->log_gxml, "subversion_log");
-	subversion_log_vbox = glade_xml_get_widget (plugin->log_gxml, "subversion_log_vbox");
-	log_changes_view = glade_xml_get_widget (plugin->log_gxml, "log_changes_view");
-	log_whole_project_check = glade_xml_get_widget (plugin->log_gxml, 
-													"log_whole_project_check");
-	log_file_entry = glade_xml_get_widget (plugin->log_gxml, "log_file_entry");
-	log_view_button = glade_xml_get_widget (plugin->log_gxml, "log_view_button");
-	log_diff_previous_button = glade_xml_get_widget (plugin->log_gxml, 
-													 "log_diff_previous_button");
-	log_diff_selected_button = glade_xml_get_widget (plugin->log_gxml,
-													 "log_diff_selected_button");
-	log_view_selected_button = glade_xml_get_widget (plugin->log_gxml,
-													 "log_view_selected_button");
-	button = glade_xml_get_widget(plugin->log_gxml, BROWSE_BUTTON_LOG_DIALOG);
+	subversion_log = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, "subversion_log"));
+	subversion_log_vbox = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, "subversion_log_vbox"));
+	log_changes_view = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, "log_changes_view"));
+	log_whole_project_check = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, 
+													"log_whole_project_check"));
+	log_file_entry = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, "log_file_entry"));
+	log_view_button = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, "log_view_button"));
+	log_diff_previous_button = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, 
+													 "log_diff_previous_button"));
+	log_diff_selected_button = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml,
+													 "log_diff_selected_button"));
+	log_view_selected_button = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml,
+													 "log_view_selected_button"));
+	button = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, BROWSE_BUTTON_LOG_DIALOG));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 		G_CALLBACK(on_subversion_browse_button_clicked), log_file_entry);
 
@@ -666,9 +666,9 @@ on_fm_subversion_log (GtkAction *action, Subversion *plugin)
 	GtkWidget *log_file_entry;
 	GtkWidget *log_whole_project_check;
 	
-	log_file_entry = glade_xml_get_widget (plugin->log_gxml, "log_file_entry");
-	log_whole_project_check = glade_xml_get_widget (plugin->log_gxml,
-													"log_whole_project_check");
+	log_file_entry = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml, "log_file_entry"));
+	log_whole_project_check = GTK_WIDGET (gtk_builder_get_object (plugin->log_bxml,
+													"log_whole_project_check"));
 	
 	gtk_entry_set_text (GTK_ENTRY (log_file_entry), 
 						plugin->fm_current_filename);
@@ -683,13 +683,13 @@ on_fm_subversion_log (GtkAction *action, Subversion *plugin)
 }
 
 void
-subversion_log_set_whole_project_sensitive (GladeXML *log_gxml, 
+subversion_log_set_whole_project_sensitive (GtkBuilder *log_bxml, 
 											gboolean sensitive)
 {
 	GtkWidget *log_whole_project_check;
 	
-	log_whole_project_check = glade_xml_get_widget (log_gxml,
-													"log_whole_project_check");
+	log_whole_project_check = GTK_WIDGET (gtk_builder_get_object (log_bxml,
+													"log_whole_project_check"));
 	
 	gtk_widget_set_sensitive (log_whole_project_check, sensitive);
 	
diff --git a/plugins/subversion/subversion-log-dialog.h b/plugins/subversion/subversion-log-dialog.h
index a3f0bf8..7b1436e 100644
--- a/plugins/subversion/subversion-log-dialog.h
+++ b/plugins/subversion/subversion-log-dialog.h
@@ -36,7 +36,7 @@ void on_menu_subversion_log (GtkAction* action, Subversion* plugin);
 void on_fm_subversion_log (GtkAction *action, Subversion *plugin);
 
 GtkWidget *subversion_log_window_create (Subversion *plugin);
-void subversion_log_set_whole_project_sensitive (GladeXML *log_gxml,
+void subversion_log_set_whole_project_sensitive (GtkBuilder *log_bxml,
 												 gboolean sensitive);
 
 #endif
diff --git a/plugins/subversion/subversion-merge-dialog.c b/plugins/subversion/subversion-merge-dialog.c
index 8e74c1e..4e4b069 100644
--- a/plugins/subversion/subversion-merge-dialog.c
+++ b/plugins/subversion/subversion-merge-dialog.c
@@ -68,28 +68,28 @@ on_subversion_merge_response (GtkDialog *dialog, gint response,
 	
 	if (response == GTK_RESPONSE_OK)
 	{
-		merge_first_path_entry = glade_xml_get_widget (data->gxml, 
-													   "merge_first_path_entry");
-		merge_second_path_entry = glade_xml_get_widget (data->gxml,
-														"merge_second_path_entry");
-		merge_working_copy_path_entry = glade_xml_get_widget (data->gxml,
-															  "merge_working_copy_path_entry");
-		merge_start_revision_radio = glade_xml_get_widget (data->gxml,
-														   "merge_start_revision_radio");
-		merge_start_revision_entry = glade_xml_get_widget (data->gxml,
-														   "merge_start_revision_entry");
-		merge_end_revision_radio = glade_xml_get_widget (data->gxml,
-														 "merge_end_revision_radio");
-		merge_end_revision_entry = glade_xml_get_widget (data->gxml,
-														 "merge_end_revision_entry");
-		merge_no_recursive_check = glade_xml_get_widget (data->gxml,
-														 "merge_no_recursive_check");
-		merge_ignore_ancestry_check = glade_xml_get_widget (data->gxml,
-															"merge_ignore_ancestry_check");
-		merge_force_check = glade_xml_get_widget (data->gxml, 
-												  "merge_force_check");
-		merge_dry_run_check = glade_xml_get_widget (data->gxml,
-													"merge_dry_run_check");
+		merge_first_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													   "merge_first_path_entry"));
+		merge_second_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														"merge_second_path_entry"));
+		merge_working_copy_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+															  "merge_working_copy_path_entry"));
+		merge_start_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														   "merge_start_revision_radio"));
+		merge_start_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														   "merge_start_revision_entry"));
+		merge_end_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														 "merge_end_revision_radio"));
+		merge_end_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														 "merge_end_revision_entry"));
+		merge_no_recursive_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														 "merge_no_recursive_check"));
+		merge_ignore_ancestry_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+															"merge_ignore_ancestry_check"));
+		merge_force_check = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+												  "merge_force_check"));
+		merge_dry_run_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													"merge_dry_run_check"));
 		
 		if (!check_input (GTK_WIDGET (dialog), merge_first_path_entry,
 						  _("Please enter the first path.")))
@@ -179,9 +179,9 @@ on_merge_first_path_browse_button_clicked (GtkButton *button,
 	GtkWidget *file_chooser_dialog;
 	gchar *selected_path;
 	
-	subversion_merge = glade_xml_get_widget (data->gxml, "subversion_merge");
-	merge_first_path_entry = glade_xml_get_widget (data->gxml, 
-												   "merge_first_path_entry");
+	subversion_merge = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_merge"));
+	merge_first_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+												   "merge_first_path_entry"));
 	file_chooser_dialog = gtk_file_chooser_dialog_new ("Select file or folder",
 													   GTK_WINDOW (subversion_merge),
 													   GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -210,9 +210,9 @@ on_merge_second_path_browse_button_clicked (GtkButton *button,
 	GtkWidget *file_chooser_dialog;
 	gchar *selected_path;
 	
-	subversion_merge = glade_xml_get_widget (data->gxml, "subversion_merge");
-	merge_second_path_entry = glade_xml_get_widget (data->gxml, 
-												    "merge_second_path_entry");
+	subversion_merge = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_merge"));
+	merge_second_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+												    "merge_second_path_entry"));
 	file_chooser_dialog = gtk_file_chooser_dialog_new ("Select file or folder",
 													   GTK_WINDOW (subversion_merge),
 													   GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -241,15 +241,15 @@ on_merge_use_first_path_check_toggled (GtkToggleButton *toggle_button,
 	gboolean active;
 	const gchar *first_path;
 	
-	merge_second_path_entry = glade_xml_get_widget (data->gxml,
-													"merge_second_path_entry");
+	merge_second_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													"merge_second_path_entry"));
 	
 	active = gtk_toggle_button_get_active (toggle_button);
 	
 	if (active)
 	{
-		merge_first_path_entry = glade_xml_get_widget (data->gxml,
-													   "merge_first_path_entry");
+		merge_first_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													   "merge_first_path_entry"));
 		first_path = gtk_entry_get_text (GTK_ENTRY (merge_first_path_entry));
 		
 		gtk_entry_set_text (GTK_ENTRY (merge_second_path_entry), first_path);
@@ -267,9 +267,9 @@ on_merge_start_revision_radio_toggled (GtkToggleButton *toggle_button,
 	GtkWidget *subversion_merge;
 	gboolean active;
 	
-	merge_start_revision_entry = glade_xml_get_widget (data->gxml, 
-													   "merge_start_revision_entry");
-	subversion_merge = glade_xml_get_widget (data->gxml, "subversion_merge");
+	merge_start_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													   "merge_start_revision_entry"));
+	subversion_merge = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_merge"));
 	
 	active = gtk_toggle_button_get_active (toggle_button);
 	
@@ -290,9 +290,9 @@ on_merge_end_revision_radio_toggled (GtkToggleButton *toggle_button,
 	GtkWidget *subversion_merge;
 	gboolean active;
 	
-	merge_end_revision_entry = glade_xml_get_widget (data->gxml, 
-													   "merge_end_revision_entry");
-	subversion_merge = glade_xml_get_widget (data->gxml, "subversion_merge");
+	merge_end_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													   "merge_end_revision_entry"));
+	subversion_merge = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_merge"));
 	
 	active = gtk_toggle_button_get_active (toggle_button);
 	
@@ -308,7 +308,7 @@ on_merge_end_revision_radio_toggled (GtkToggleButton *toggle_button,
 static void 
 subversion_merge_dialog (GtkAction *action, Subversion *plugin)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *subversion_merge;
 	GtkWidget *merge_first_path_browse_button;
 	GtkWidget *merge_second_path_browse_button;
@@ -318,25 +318,29 @@ subversion_merge_dialog (GtkAction *action, Subversion *plugin)
 	GtkWidget *merge_end_revision_radio;
 	GtkWidget *button;
 	SubversionData *data;
-	
-	gxml = glade_xml_new (GLADE_FILE, "subversion_merge", NULL);
-	
-	subversion_merge = glade_xml_get_widget (gxml,
-											  "subversion_merge");
-	merge_first_path_browse_button = glade_xml_get_widget (gxml,
-														   "merge_first_path_browse_button");
-	merge_second_path_browse_button = glade_xml_get_widget (gxml, 
-															"merge_second_path_browse_button");
-	merge_use_first_path_check = glade_xml_get_widget (gxml,
-													   "merge_use_first_path_check");
-	merge_working_copy_path_entry = glade_xml_get_widget (gxml,
-														  "merge_working_copy_path_entry");
-	merge_start_revision_radio = glade_xml_get_widget (gxml,
-													   "merge_start_revision_radio");
-	merge_end_revision_radio = glade_xml_get_widget (gxml,
-													 "merge_end_revision_radio");
-	
-	data = subversion_data_new (plugin, gxml);
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+	subversion_merge = GTK_WIDGET (gtk_builder_get_object (bxml,
+											  "subversion_merge"));
+	merge_first_path_browse_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+														   "merge_first_path_browse_button"));
+	merge_second_path_browse_button = GTK_WIDGET (gtk_builder_get_object (bxml, 
+															"merge_second_path_browse_button"));
+	merge_use_first_path_check = GTK_WIDGET (gtk_builder_get_object (bxml,
+													   "merge_use_first_path_check"));
+	merge_working_copy_path_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+														  "merge_working_copy_path_entry"));
+	merge_start_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+													   "merge_start_revision_radio"));
+	merge_end_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+													 "merge_end_revision_radio"));
+	
+	data = subversion_data_new (plugin, bxml);
 	
 	gtk_entry_set_text (GTK_ENTRY (merge_working_copy_path_entry),
 						plugin->project_root_dir);
@@ -345,7 +349,7 @@ subversion_merge_dialog (GtkAction *action, Subversion *plugin)
 					  G_CALLBACK (on_subversion_merge_response),
 					  data);
 
-	button = glade_xml_get_widget(gxml, BROWSE_BUTTON_MERGE_DIALOG);
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, BROWSE_BUTTON_MERGE_DIALOG));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 		G_CALLBACK(on_subversion_browse_button_clicked), merge_working_copy_path_entry);
 
diff --git a/plugins/subversion/subversion-remove-dialog.c b/plugins/subversion/subversion-remove-dialog.c
index b10f47e..763e401 100644
--- a/plugins/subversion/subversion-remove-dialog.c
+++ b/plugins/subversion/subversion-remove-dialog.c
@@ -53,9 +53,9 @@ on_remove_path_browse_button_clicked (GtkButton *button,
 	GtkWidget *file_chooser_dialog;
 	gchar *selected_path;
 	
-	subversion_remove = glade_xml_get_widget (data->gxml, "subversion_remove");
-	remove_path_entry = glade_xml_get_widget (data->gxml, 
-											  "remove_path_entry");
+	subversion_remove = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_remove"));
+	remove_path_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+											  "remove_path_entry"));
 	file_chooser_dialog = gtk_file_chooser_dialog_new ("Select file or folder",
 													   GTK_WINDOW (subversion_remove),
 													   GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -83,15 +83,15 @@ on_subversion_remove_response(GtkDialog* dialog, gint response,
 	{
 		case GTK_RESPONSE_OK:
 		{
-			GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "remove_path_entry");
-			GtkWidget* force = glade_xml_get_widget(data->gxml, "subversion_force");
+			GtkWidget* fileentry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "remove_path_entry"));
+			GtkWidget* force = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_force"));
 			GtkWidget *remove_log_view;
 			const gchar* filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
 			gchar *log;
 			SvnRemoveCommand *remove_command;
 			
-			remove_log_view = glade_xml_get_widget (data->gxml, 
-													"remove_log_view");
+			remove_log_view = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+													"remove_log_view"));
 			log = get_log_from_textview (remove_log_view);
 			
 			if (!check_input (GTK_WIDGET (dialog), 
@@ -125,22 +125,27 @@ on_subversion_remove_response(GtkDialog* dialog, gint response,
 static void
 subversion_remove_dialog(GtkAction* action, Subversion* plugin, gchar *filename)
 {
-	GladeXML* gxml;
+	GtkBuilder* bxml = gtk_builder_new ();
 	GtkWidget* dialog; 
 	GtkWidget* remove_path_entry;
 	GtkWidget *remove_path_browse_button;
 	SubversionData* data;
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
 	
-	gxml = glade_xml_new(GLADE_FILE, "subversion_remove", NULL);
-	
-	dialog = glade_xml_get_widget(gxml, "subversion_remove");
-	remove_path_entry = glade_xml_get_widget(gxml, "remove_path_entry");
-	remove_path_browse_button = glade_xml_get_widget (gxml, 
-													  "remove_path_browse_button");
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_remove"));
+	remove_path_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "remove_path_entry"));
+	remove_path_browse_button = GTK_WIDGET (gtk_builder_get_object (bxml, 
+													  "remove_path_browse_button"));
 	if (remove_path_entry)
 		gtk_entry_set_text(GTK_ENTRY(remove_path_entry), filename);
 
-	data = subversion_data_new(plugin, gxml);
+	data = subversion_data_new(plugin, bxml);
 	g_signal_connect(G_OBJECT(dialog), "response", 
 		G_CALLBACK(on_subversion_remove_response), data);
 	
diff --git a/plugins/subversion/subversion-resolve-dialog.c b/plugins/subversion/subversion-resolve-dialog.c
index 6ee20d9..6c61ffe 100644
--- a/plugins/subversion/subversion-resolve-dialog.c
+++ b/plugins/subversion/subversion-resolve-dialog.c
@@ -50,8 +50,8 @@ on_subversion_resolve_response (GtkDialog *dialog, gint response,
 	
 	if (response == GTK_RESPONSE_OK)
 	{
-		resolve_status_view = glade_xml_get_widget (data->gxml,
-													"resolve_status_view");
+		resolve_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+													"resolve_status_view"));
 		selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (resolve_status_view));
 		resolve_command = svn_resolve_command_new (selected_paths, TRUE);
 		
@@ -77,7 +77,7 @@ on_subversion_resolve_response (GtkDialog *dialog, gint response,
 static void 
 subversion_resolve_dialog (GtkAction *action, Subversion *plugin)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *subversion_resolve;
 	GtkWidget *resolve_select_all_button;
 	GtkWidget *resolve_clear_button;
@@ -85,24 +85,29 @@ subversion_resolve_dialog (GtkAction *action, Subversion *plugin)
 	GtkWidget *resolve_status_progress_bar;
 	SvnStatusCommand *status_command;
 	SubversionData *data;
-	
-	gxml = glade_xml_new (GLADE_FILE, "subversion_resolve", NULL);
-	
-	subversion_resolve = glade_xml_get_widget (gxml,
-											   "subversion_resolve");
-	resolve_select_all_button = glade_xml_get_widget (gxml,
-													  "resolve_select_all_button");
-	resolve_clear_button = glade_xml_get_widget (gxml,
-												 "resolve_clear_button");
-	resolve_status_view = glade_xml_get_widget (gxml,
-												"resolve_status_view");
-	resolve_status_progress_bar = glade_xml_get_widget (gxml,
-														"resolve_status_progress_bar");
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	subversion_resolve = GTK_WIDGET (gtk_builder_get_object (bxml,
+											   "subversion_resolve"));
+	resolve_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+													  "resolve_select_all_button"));
+	resolve_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+												 "resolve_clear_button"));
+	resolve_status_view = GTK_WIDGET (gtk_builder_get_object (bxml,
+												"resolve_status_view"));
+	resolve_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml,
+														"resolve_status_progress_bar"));
 	
 	status_command = svn_status_command_new (plugin->project_root_dir, TRUE,
 											 FALSE);
 	
-	data = subversion_data_new (plugin, gxml);
+	data = subversion_data_new (plugin, bxml);
 	
 	g_signal_connect (G_OBJECT (subversion_resolve), "response",
 					  G_CALLBACK (on_subversion_resolve_response),
diff --git a/plugins/subversion/subversion-revert-dialog.c b/plugins/subversion/subversion-revert-dialog.c
index 6200c51..62d10bc 100644
--- a/plugins/subversion/subversion-revert-dialog.c
+++ b/plugins/subversion/subversion-revert-dialog.c
@@ -50,8 +50,8 @@ on_subversion_revert_response (GtkDialog *dialog, gint response,
 	
 	if (response == GTK_RESPONSE_OK)
 	{
-		revert_status_view = glade_xml_get_widget (data->gxml,
-												   "revert_status_view");
+		revert_status_view = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+												   "revert_status_view"));
 		selected_paths = anjuta_vcs_status_tree_view_get_selected (ANJUTA_VCS_STATUS_TREE_VIEW (revert_status_view));
 		revert_command = svn_revert_command_new_list (selected_paths, TRUE);
 		
@@ -77,7 +77,7 @@ on_subversion_revert_response (GtkDialog *dialog, gint response,
 static void 
 subversion_revert_dialog (GtkAction *action, Subversion *plugin)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *subversion_revert;
 	GtkWidget *revert_select_all_button;
 	GtkWidget *revert_clear_button;
@@ -85,24 +85,29 @@ subversion_revert_dialog (GtkAction *action, Subversion *plugin)
 	GtkWidget *revert_status_progress_bar;
 	SvnStatusCommand *status_command;
 	SubversionData *data;
-	
-	gxml = glade_xml_new (GLADE_FILE, "subversion_revert", NULL);
-	
-	subversion_revert = glade_xml_get_widget (gxml,
-											  "subversion_revert");
-	revert_select_all_button = glade_xml_get_widget (gxml,
-													 "revert_select_all_button");
-	revert_clear_button = glade_xml_get_widget (gxml,
-												"revert_clear_button");
-	revert_status_view = glade_xml_get_widget (gxml,
-											   "revert_status_view");
-	revert_status_progress_bar = glade_xml_get_widget (gxml,
-													   "revert_status_progress_bar");
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	subversion_revert = GTK_WIDGET (gtk_builder_get_object (bxml,
+											  "subversion_revert"));
+	revert_select_all_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+													 "revert_select_all_button"));
+	revert_clear_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+												"revert_clear_button"));
+	revert_status_view = GTK_WIDGET (gtk_builder_get_object (bxml,
+											   "revert_status_view"));
+	revert_status_progress_bar = GTK_WIDGET (gtk_builder_get_object (bxml,
+													   "revert_status_progress_bar"));
 	
 	status_command = svn_status_command_new (plugin->project_root_dir, TRUE,
 											 FALSE);
 	
-	data = subversion_data_new (plugin, gxml);
+	data = subversion_data_new (plugin, bxml);
 	
 	g_signal_connect (G_OBJECT (subversion_revert), "response",
 					  G_CALLBACK (on_subversion_revert_response),
diff --git a/plugins/subversion/subversion-switch-dialog.c b/plugins/subversion/subversion-switch-dialog.c
index 4ac84ed..3d468e1 100644
--- a/plugins/subversion/subversion-switch-dialog.c
+++ b/plugins/subversion/subversion-switch-dialog.c
@@ -34,10 +34,10 @@ on_switch_other_revision_radio_toggled (GtkToggleButton *toggle_button,
 	GtkWidget *subversion_switch;
 	gboolean active;
 	
-	switch_revision_entry = glade_xml_get_widget (data->gxml, 
-												  "switch_revision_entry");
-	subversion_switch = glade_xml_get_widget (data->gxml,
-											  "subversion_switch");
+	switch_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+												  "switch_revision_entry"));
+	subversion_switch = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+											  "subversion_switch"));
 	active = gtk_toggle_button_get_active (toggle_button);
 	gtk_widget_set_sensitive (switch_revision_entry, active);
 	
@@ -82,16 +82,16 @@ on_subversion_switch_response (GtkDialog *dialog, gint response,
 	
 	if (response == GTK_RESPONSE_OK)
 	{
-		switch_working_copy_entry = glade_xml_get_widget (data->gxml, 
-												  		  "switch_working_copy_entry");
-		switch_url_entry = glade_xml_get_widget (data->gxml,
-												 "switch_url_entry");
-		switch_head_revision_radio = glade_xml_get_widget (data->gxml,
-														   "switch_head_revision_radio");
-		switch_other_revision_radio = glade_xml_get_widget (data->gxml,
-														    "switch_other_revision_radio");
-		switch_no_recursive_check = glade_xml_get_widget (data->gxml,
-														  "switch_no_recursive_check");
+		switch_working_copy_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+												  		  "switch_working_copy_entry"));
+		switch_url_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+												 "switch_url_entry"));
+		switch_head_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														   "switch_head_revision_radio"));
+		switch_other_revision_radio = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														    "switch_other_revision_radio"));
+		switch_no_recursive_check = GTK_WIDGET (gtk_builder_get_object (data->bxml,
+														  "switch_no_recursive_check"));
 		
 		working_copy_path = gtk_editable_get_chars (GTK_EDITABLE (switch_working_copy_entry),
 											  		0, -1);
@@ -115,8 +115,8 @@ on_subversion_switch_response (GtkDialog *dialog, gint response,
 		
 		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (switch_other_revision_radio)))
 		{
-			switch_revision_entry = glade_xml_get_widget (data->gxml, 
-														  "switch_revision_entry");
+			switch_revision_entry = GTK_WIDGET (gtk_builder_get_object (data->bxml, 
+														  "switch_revision_entry"));
 			
 			if (!check_input (GTK_WIDGET (dialog), switch_revision_entry,
 						  	  _("Please enter a revision.")))
@@ -155,23 +155,29 @@ on_subversion_switch_response (GtkDialog *dialog, gint response,
 static void
 subversion_switch_dialog (GtkAction *action, Subversion *plugin)
 {
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkWidget *subversion_switch;
 	GtkWidget *switch_working_copy_entry;
 	GtkWidget *switch_other_revision_radio;
 	GtkWidget *button;
 	SubversionData *data;
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	subversion_switch = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_switch"));
+	switch_working_copy_entry = GTK_WIDGET (gtk_builder_get_object (bxml,
+													  "switch_working_copy_entry"));
+	switch_other_revision_radio = GTK_WIDGET (gtk_builder_get_object (bxml,
+													    "switch_other_revision_radio"));
 	
-	gxml = glade_xml_new (GLADE_FILE, "subversion_switch", NULL);
-	subversion_switch = glade_xml_get_widget (gxml, "subversion_switch");
-	switch_working_copy_entry = glade_xml_get_widget (gxml,
-													  "switch_working_copy_entry");
-	switch_other_revision_radio = glade_xml_get_widget (gxml,
-													    "switch_other_revision_radio");
-	
-	data = subversion_data_new (plugin, gxml);
+	data = subversion_data_new (plugin, bxml);
 
-	button = glade_xml_get_widget(gxml, BROWSE_BUTTON_SWITCH_DIALOG);
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, BROWSE_BUTTON_SWITCH_DIALOG));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 		G_CALLBACK(on_subversion_browse_button_clicked), switch_working_copy_entry);
 
diff --git a/plugins/subversion/subversion-ui-utils.c b/plugins/subversion/subversion-ui-utils.c
index 70c8c35..c4a624e 100644
--- a/plugins/subversion/subversion-ui-utils.c
+++ b/plugins/subversion/subversion-ui-utils.c
@@ -35,11 +35,11 @@ typedef struct
 } PulseProgressData;
 
 SubversionData* 
-subversion_data_new (Subversion* plugin, GladeXML* gxml)
+subversion_data_new (Subversion* plugin, GtkBuilder* bxml)
 {
 	SubversionData* data = g_new0(SubversionData, 1);
 	data->plugin = plugin;
-	data->gxml = gxml;
+	data->bxml = bxml;
 	
 	return data;
 }
diff --git a/plugins/subversion/subversion-ui-utils.h b/plugins/subversion/subversion-ui-utils.h
index 7c1c03d..09e926a 100644
--- a/plugins/subversion/subversion-ui-utils.h
+++ b/plugins/subversion/subversion-ui-utils.h
@@ -37,11 +37,11 @@
 
 typedef struct
 {
-	GladeXML* gxml;
+	GtkBuilder* bxml;
 	Subversion* plugin;
 } SubversionData;
 
-SubversionData* subversion_data_new (Subversion* plugin, GladeXML* gxml);
+SubversionData* subversion_data_new (Subversion* plugin, GtkBuilder* bxml);
 void subversion_data_free (SubversionData* data);
 void create_message_view (Subversion* plugin);
 gboolean check_input (GtkWidget *parent, GtkWidget *entry, 
diff --git a/plugins/subversion/subversion-update-dialog.c b/plugins/subversion/subversion-update-dialog.c
index 7a7295b..68f3aa6 100644
--- a/plugins/subversion/subversion-update-dialog.c
+++ b/plugins/subversion/subversion-update-dialog.c
@@ -56,12 +56,12 @@ on_subversion_update_response(GtkDialog* dialog, gint response, SubversionData*
 		
 			GtkWidget* norecurse;
 			GtkWidget* revisionentry;
-			GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "subversion_filename");
+			GtkWidget* fileentry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_update_filename"));
 			const gchar* filename = g_strdup(gtk_entry_get_text(GTK_ENTRY(fileentry)));
 			SvnUpdateCommand *update_command;
 			
-			norecurse = glade_xml_get_widget(data->gxml, "subversion_norecurse");
-			revisionentry = glade_xml_get_widget(data->gxml, "subversion_revision");
+			norecurse = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_update_norecurse"));
+			revisionentry = GTK_WIDGET (gtk_builder_get_object (data->bxml, "subversion_revision"));
 			revision = gtk_entry_get_text(GTK_ENTRY(revisionentry));
 			
 			if (!check_input (GTK_WIDGET (dialog), 
@@ -101,31 +101,36 @@ on_subversion_update_response(GtkDialog* dialog, gint response, SubversionData*
 static void
 subversion_update_dialog (GtkAction* action, Subversion* plugin, gchar *filename)
 {
-	GladeXML* gxml;
+	GtkBuilder* bxml = gtk_builder_new ();
 	GtkWidget* dialog; 
 	GtkWidget* fileentry;
 	GtkWidget* project;
 	GtkWidget* button;
 	SubversionData* data;
-	
-	gxml = glade_xml_new(GLADE_FILE, "subversion_update", NULL);
-	
-	dialog = glade_xml_get_widget(gxml, "subversion_update");
-	fileentry = glade_xml_get_widget(gxml, "subversion_filename");
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_update"));
+	fileentry = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_update_filename"));
 	if (filename)
 		gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
 	
-	project = glade_xml_get_widget(gxml, "subversion_project");
+	project = GTK_WIDGET (gtk_builder_get_object (bxml, "subversion_project"));
 	g_object_set_data (G_OBJECT (project), "fileentry", fileentry);
 	g_signal_connect(G_OBJECT(project), "toggled", 
 		G_CALLBACK(on_whole_project_toggled), plugin);
 	init_whole_project(plugin, project, !filename);
 
-	button = glade_xml_get_widget(gxml, BROWSE_BUTTON_UPDATE_DIALOG);
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, BROWSE_BUTTON_UPDATE_DIALOG));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 		G_CALLBACK(on_subversion_browse_button_clicked), fileentry);
 
-	data = subversion_data_new(plugin, gxml);
+	data = subversion_data_new(plugin, bxml);
 	g_signal_connect(G_OBJECT(dialog), "response", 
 		G_CALLBACK(on_subversion_update_response), data);
 	
diff --git a/plugins/subversion/svn-command.c b/plugins/subversion/svn-command.c
index cfd130d..03219cb 100644
--- a/plugins/subversion/svn-command.c
+++ b/plugins/subversion/svn-command.c
@@ -97,15 +97,28 @@ typedef struct
 static gboolean
 simple_prompt (SimplePromptArgs *args)
 {
-	GladeXML* gxml = glade_xml_new(GLADE_FILE, "svn_user_auth", NULL);
-	GtkWidget* svn_user_auth = glade_xml_get_widget(gxml, "svn_user_auth");
-	GtkWidget* auth_realm = glade_xml_get_widget(gxml, "auth_realm");
-	GtkWidget* username_entry = glade_xml_get_widget(gxml, "username_entry");
-	GtkWidget* password_entry = glade_xml_get_widget(gxml, "password_entry");
-	GtkWidget* remember_pwd = glade_xml_get_widget(gxml, "remember_pwd");
+	GtkBuilder* bxml = gtk_builder_new ();
+	GtkWidget* svn_user_auth;
+	GtkWidget* auth_realm;
+	GtkWidget* username_entry;
+	GtkWidget* password_entry;
+	GtkWidget* remember_pwd;
 	svn_error_t *err = NULL;
 	SvnCommand *svn_command;
-	
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+	svn_user_auth = GTK_WIDGET (gtk_builder_get_object (bxml, "svn_user_auth"));
+	auth_realm = GTK_WIDGET (gtk_builder_get_object (bxml, "auth_realm"));
+	username_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "username_entry"));
+	password_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "password_entry"));
+	remember_pwd = GTK_WIDGET (gtk_builder_get_object (bxml, "remember_pwd"));
+
 	gtk_dialog_set_default_response (GTK_DIALOG (svn_user_auth), GTK_RESPONSE_OK);
 	
 	if (args->realm)
@@ -159,15 +172,26 @@ simple_prompt (SimplePromptArgs *args)
 static gboolean
 ssl_server_trust_prompt (SSLServerTrustArgs *args)
 {
-	GladeXML* gxml = glade_xml_new(GLADE_FILE, "svn_server_trust", NULL);
-	GtkWidget* svn_server_trust = glade_xml_get_widget(gxml, "svn_server_trust");
-	GtkWidget* auth_realm = glade_xml_get_widget(gxml, "realm_label");
-	GtkWidget* server_info = glade_xml_get_widget(gxml, "server_info_label");
-	GtkWidget* remember_check = glade_xml_get_widget(gxml, "remember_check");
+	GtkBuilder* bxml = gtk_builder_new ();
+	GtkWidget* svn_server_trust;
+	GtkWidget* auth_realm;
+	GtkWidget* server_info;
+	GtkWidget* remember_check;
 	svn_error_t *err = NULL;
 	gchar* info;
 	SvnCommand *svn_command;
-	
+	GError* error = NULL;
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+	svn_server_trust = GTK_WIDGET (gtk_builder_get_object (bxml, "svn_server_trust"));
+	auth_realm = GTK_WIDGET (gtk_builder_get_object (bxml, "realm_label"));
+	server_info = GTK_WIDGET (gtk_builder_get_object (bxml, "server_info_label"));
+	remember_check = GTK_WIDGET (gtk_builder_get_object (bxml, "remember_check"));
+
 	if (args->realm)
 		gtk_label_set_text (GTK_LABEL (auth_realm), args->realm);
 	
diff --git a/plugins/symbol-db/anjuta-symbol-db.glade b/plugins/symbol-db/anjuta-symbol-db.glade
index 946a0e1..fd47cf1 100644
--- a/plugins/symbol-db/anjuta-symbol-db.glade
+++ b/plugins/symbol-db/anjuta-symbol-db.glade
@@ -1,38 +1,37 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--Generated with glade3 3.4.5 on Thu Jan  8 18:45:36 2009 -->
-<glade-interface>
-  <widget class="GtkWindow" id="symbol_db_pref_window">
+<interface>
+  <object class="GtkWindow" id="symbol_db_pref_window">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
-      <widget class="GtkVBox" id="symbol_prefs">
+      <object class="GtkVBox" id="symbol_prefs">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">1</property>
         <child>
-          <widget class="GtkFrame" id="frame1">
+          <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment1">
+              <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox1">
+                  <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <widget class="GtkLabel" id="label2">
+                          <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Ctags executable:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -40,114 +39,108 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBoxEntry" id="comboboxentry1">
+                          <object class="GtkComboBoxEntry" id="comboboxentry1">
                             <property name="visible">True</property>
                             <child internal-child="entry">
-                              <widget class="GtkEntry" id="preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags">
+                              <object class="GtkEntry" id="preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox2">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:symboldb.scan_prj_pkgs">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:symboldb.scan_prj_pkgs">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text">This option enables the default packages required by your opened project, e.g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)</property>
                             <property name="label" translatable="yes">Automatically scan project's packages</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox4">
+                      <object class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:symboldb.parallel_scan">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:symboldb.parallel_scan">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text">This option means that the global system packages will be scanned contemporary with the project's ones</property>
                             <property name="label" translatable="yes">Parallel scan of project and global symbols</property>
-                            <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox5">
+                      <object class="GtkHBox" id="hbox5">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:symboldb.buffer_update">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:symboldb.buffer_update">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text">Update automatically the file's symbols without saving. The update occurs after 10 seconds of no keypress by user.</property>
                             <property name="label" translatable="yes">Automatically update symbols without saving file</property>
-                            <property name="response_id">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">3</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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;Global&lt;/b&gt;</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="padding">5</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkFrame" id="frame2">
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment2">
+              <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="top_padding">2</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -155,72 +148,66 @@
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="tags_treeview">
+                      <object class="GtkTreeView" id="tags_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label3">
+            <child type="label">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">&lt;b&gt;Available API tags&lt;/b&gt;</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="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>
             <child>
-              <widget class="GtkAlignment" id="alignment3">
+              <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
                     <property name="homogeneous">True</property>
                     <child>
-                      <widget class="GtkProgressBar" id="prefs_progressbar">
+                      <object class="GtkProgressBar" id="prefs_progressbar">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="show_text">True</property>
                         <property name="text" translatable="yes">Checking if package is parseable...</property>
                         <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
+            <child type="label">
               <placeholder/>
-              <packing>
-                <property name="type">label_item</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>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/symbol-db/symbol-db-prefs.c b/plugins/symbol-db/symbol-db-prefs.c
index 31e20ae..4b2a311 100644
--- a/plugins/symbol-db/symbol-db-prefs.c
+++ b/plugins/symbol-db/symbol-db-prefs.c
@@ -32,8 +32,8 @@
 
 #include "symbol-db-prefs.h"
 
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-symbol-db.glade"
-#define GLADE_ROOT "symbol_prefs"
+#define BUILDER_FILE PACKAGE_DATA_DIR"/glade/anjuta-symbol-db.glade"
+#define BUILDER_ROOT "symbol_prefs"
 #define ICON_FILE "anjuta-symbol-db-plugin-48.png"
 
 
@@ -55,7 +55,7 @@ static unsigned int signals[LAST_SIGNAL] = { 0 };
 
 struct _SymbolDBPrefsPriv {
 	GtkListStore *prefs_list_store;
-	GladeXML *prefs_gxml;
+	GtkBuilder *prefs_bxml;
 	AnjutaLauncher *pkg_config_launcher;	
 	AnjutaPreferences *prefs;
 	
@@ -106,7 +106,7 @@ on_prefs_executable_changed (/*GtkFileChooser *chooser,*/ GtkComboBox *chooser,
 	if (new_file != NULL) 
 	{
 		GtkWidget *fchooser;
-		fchooser = 	glade_xml_get_widget (priv->prefs_gxml, CTAGS_PREFS);	
+		fchooser = 	GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, CTAGS_PREFS));	
 		/*gtk_widget_set_sensitive (fchooser, TRUE);*/
 		
 		anjuta_preferences_set (priv->prefs, CTAGS_PREFS_KEY,
@@ -190,7 +190,7 @@ on_listall_exit (AnjutaLauncher * launcher, int child_pid,
 	g_signal_handlers_disconnect_by_func (launcher, on_listall_exit,
 										  user_data);	
 
-	treeview = glade_xml_get_widget (priv->prefs_gxml, "tags_treeview");
+	treeview = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "tags_treeview"));
 	gtk_widget_set_sensitive (treeview, TRUE);
 	
 	/* we should have pkg_list filled with packages names 
@@ -253,9 +253,9 @@ on_tag_load_toggled_parseable_cb (SymbolDBSystem *sdbs,
 	priv = sdbp->priv;
 	
 	DEBUG_PRINT ("on_tag_load_toggled_parseable_cb %d", is_parseable);
-	prefs_window = GTK_WINDOW (glade_xml_get_widget (priv->prefs_gxml, "symbol_db_pref_window"));
-	treeview = glade_xml_get_widget (priv->prefs_gxml, "tags_treeview");
-	prefs_progressbar = glade_xml_get_widget (priv->prefs_gxml, "prefs_progressbar");
+	prefs_window = GTK_WINDOW (gtk_builder_get_object (priv->prefs_bxml, "symbol_db_pref_window"));
+	treeview = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "tags_treeview"));
+	prefs_progressbar = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "prefs_progressbar"));
 
 	store = priv->prefs_list_store;
 	path = gtk_tree_path_new_from_string (path_str);
@@ -332,13 +332,13 @@ on_tag_load_toggled (GtkCellRendererToggle *cell, char *path_str,
 						-1);
 	gtk_tree_path_free (path);
 	
-	prefs_progressbar = glade_xml_get_widget (priv->prefs_gxml, "prefs_progressbar");
+	prefs_progressbar = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "prefs_progressbar"));
 	gtk_widget_show_all (prefs_progressbar);	
 	
 	gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (prefs_progressbar), 1.0);
 	gtk_progress_bar_pulse (GTK_PROGRESS_BAR (prefs_progressbar));
 	
-	treeview = glade_xml_get_widget (priv->prefs_gxml, "tags_treeview");
+	treeview = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "tags_treeview"));
 	gtk_widget_set_sensitive (treeview, FALSE);
 	
 	pdata = g_new0 (ParseableData, 1);
@@ -359,15 +359,15 @@ sdb_prefs_init1 (SymbolDBPrefs *sdbp)
 
 	priv = sdbp->priv;
 
-	fchooser = 	glade_xml_get_widget (priv->prefs_gxml, CTAGS_PREFS);
+	fchooser = 	GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, CTAGS_PREFS));
 	/* we will reactivate it after the listall has been finished */
 	/*gtk_widget_set_sensitive (fchooser, FALSE);*/
 			
-	anjuta_preferences_add_page (priv->prefs, 
-								 priv->prefs_gxml, 
-								 GLADE_ROOT, 
-								 _("Symbol Database"),  
-								 ICON_FILE);
+	anjuta_preferences_add_from_builder (priv->prefs, 
+									 priv->prefs_bxml, 
+									 BUILDER_ROOT, 
+									 _("Symbol Database"),  
+									 ICON_FILE);
 	
 	ctags_value = anjuta_preferences_get (priv->prefs, CTAGS_PREFS_KEY);
 	
@@ -424,10 +424,16 @@ sdb_prefs_init (SymbolDBPrefs *object)
 	
 	DEBUG_PRINT ("%s", "symbol_db_prefs_init ()");
 	
-	if (priv->prefs_gxml == NULL)
+	if (priv->prefs_bxml == NULL)
 	{
+		GError* error = NULL;
 		/* Create the preferences page */
-		priv->prefs_gxml = glade_xml_new (GLADE_FILE, GLADE_ROOT, NULL);	
+		priv->prefs_bxml = gtk_builder_new ();
+		if (!gtk_builder_add_from_file (priv->prefs_bxml, BUILDER_FILE, &error))
+		{
+			g_warning ("Couldn't load builder file: %s", error->message);
+			g_error_free(error);
+		}		
 	}		
 
 	/* init GtkListStore */
@@ -438,7 +444,7 @@ sdb_prefs_init (SymbolDBPrefs *object)
 		require_scan = TRUE;
 	}
 	
-	treeview = glade_xml_get_widget (priv->prefs_gxml, "tags_treeview");
+	treeview = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "tags_treeview"));
 	/* on_listall_exit will reactivate this */
 	gtk_widget_set_sensitive (treeview, FALSE);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (treeview),
@@ -467,10 +473,10 @@ sdb_prefs_init (SymbolDBPrefs *object)
 	
 	/* frame3 show all */
 	GtkWidget *frame3;
-	frame3 = glade_xml_get_widget (priv->prefs_gxml, "frame3");
+	frame3 = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, "frame3"));
 	gtk_widget_show_all (frame3);
-	GtkWidget *prefs_progressbar = glade_xml_get_widget (priv->prefs_gxml, 
-														 "prefs_progressbar");
+	GtkWidget *prefs_progressbar = GTK_WIDGET (gtk_builder_get_object (priv->prefs_bxml, 
+														 "prefs_progressbar"));
 	gtk_widget_hide (prefs_progressbar);	
 	
 	/* listall launcher thing */
@@ -518,8 +524,8 @@ sdb_prefs_finalize (GObject *object)
 	g_list_free (priv->pkg_list);
 	priv->pkg_list = NULL;
 
-	if (priv->prefs_gxml != NULL)
-		g_object_unref (priv->prefs_gxml);
+	if (priv->prefs_bxml != NULL)
+		g_object_unref (priv->prefs_bxml);
 
 	if (priv->prefs_list_store != NULL)
 		g_object_unref (priv->prefs_list_store);
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 1cf0ec0..ba59e45 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -40,7 +40,6 @@ libanjuta_terminal_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 # Plugin dependencies
 libanjuta_terminal_la_LIBADD = \
 	$(GCONF_LIBS) \
-	$(GLADE_LIBS) \
 	$(VTE_LIBS) \
 	$(LIBANJUTA_LIBS)
 	
diff --git a/plugins/terminal/anjuta-terminal-plugin.glade b/plugins/terminal/anjuta-terminal-plugin.glade
index 9ab5348..14b72f7 100644
--- a/plugins/terminal/anjuta-terminal-plugin.glade
+++ b/plugins/terminal/anjuta-terminal-plugin.glade
@@ -1,17 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkWindow" id="preferences_dialog_terminal">
+<interface>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="preferences_dialog_terminal">
     <property name="title" translatable="yes">window8</property>
     <child>
-      <widget class="GtkFrame" id="Terminal">
+      <object class="GtkFrame" id="Terminal">
         <property name="visible">True</property>
         <property name="border_width">5</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">GTK_SHADOW_NONE</property>
         <child>
-          <widget class="GtkTable" id="table24">
+          <object class="GtkTable" id="table24">
             <property name="visible">True</property>
             <property name="border_width">10</property>
             <property name="n_rows">2</property>
@@ -19,60 +28,60 @@
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <widget class="GtkComboBox" id="profile_list_combo">
+              <object class="GtkComboBox" id="profile_list_combo">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="items" translatable="yes">Default
-
-</property>
-              </widget>
+                <property name="model">model1</property>
+                <child>
+                  <object class="GtkCellRendererText" id="renderer1"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                  </attributes>
+                </child>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:terminal.default.profile">
+              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:terminal.default.profile">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Use currently selected profile in GNOME terminal</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label167">
+              <object class="GtkLabel" id="label167">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Use GNOME terminal profile:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
-          </widget>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="label166">
+        <child type="label">
+          <object class="GtkLabel" id="label166">
             <property name="visible">True</property>
             <property name="label" translatable="yes">&lt;b&gt;Terminal options&lt;/b&gt;</property>
             <property name="use_markup">True</property>
-          </widget>
-          <packing>
-            <property name="type">label_item</property>
-          </packing>
+          </object>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/plugins/terminal/terminal.c b/plugins/terminal/terminal.c
index a25de13..ac0131f 100644
--- a/plugins/terminal/terminal.c
+++ b/plugins/terminal/terminal.c
@@ -33,7 +33,7 @@
 #include <signal.h>
 
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-terminal-plugin.ui"
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-terminal-plugin.glade"
+#define PREFS_BUILDER PACKAGE_DATA_DIR"/glade/anjuta-terminal-plugin.glade"
 #define ICON_FILE "anjuta-terminal-plugin-48.png"
 
 /* Some desktop/gnome-terminal gconf keys. */
@@ -867,17 +867,26 @@ on_concat_string (gpointer data, gpointer user_data)
 static void
 ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
 {
+	GError* error = NULL;
 	GSList *profiles;
 	GConfClient *client;	
 	
 	/* Create the terminal preferences page */
 	TerminalPlugin* term_plugin = ANJUTA_PLUGIN_TERMINAL (ipref);
-	GladeXML *gxml = glade_xml_new (PREFS_GLADE, "preferences_dialog_terminal", NULL);
-	anjuta_preferences_add_page (term_plugin->prefs, gxml,
+	GtkBuilder *bxml = gtk_builder_new ();
+
+	if (!gtk_builder_add_from_file (bxml, PREFS_BUILDER, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
+	}
+
+
+	anjuta_preferences_add_from_builder (term_plugin->prefs, bxml,
 									"Terminal", _("Terminal"), ICON_FILE);
 	
-	term_plugin->pref_profile_combo = glade_xml_get_widget (gxml, "profile_list_combo");
-	term_plugin->pref_default_button = glade_xml_get_widget (gxml, "preferences_toggle:bool:1:0:terminal.default.profile");
+	term_plugin->pref_profile_combo = GTK_WIDGET (gtk_builder_get_object (bxml, "profile_list_combo"));
+	term_plugin->pref_default_button = GTK_WIDGET (gtk_builder_get_object (bxml, "preferences_toggle:bool:1:0:terminal.default.profile"));
 
 	/* Update the currently available list of terminal profiles */
 	client = gconf_client_get_default ();
@@ -918,7 +927,7 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
 		gtk_widget_set_sensitive (term_plugin->pref_default_button, FALSE);
 	}
 	
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 }
 
 static void
diff --git a/plugins/tools/Makefile.am b/plugins/tools/Makefile.am
index b474301..f3aa7e4 100644
--- a/plugins/tools/Makefile.am
+++ b/plugins/tools/Makefile.am
@@ -32,7 +32,6 @@ libanjuta_tools_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_tools_la_LIBADD = \
 	$(GNOME_UI_LIBS) \
-	$(GLADE_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_tools_la_SOURCES= \
diff --git a/plugins/tools/anjuta-tools.glade b/plugins/tools/anjuta-tools.glade
index 42a9ef2..cff936e 100644
--- a/plugins/tools/anjuta-tools.glade
+++ b/plugins/tools/anjuta-tools.glade
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--Generated with glade3 3.4.2 on Mon Mar 31 15:12:40 2008 -->
-<glade-interface>
-  <widget class="GtkWindow" id="list_tools">
+<interface>
+  <object class="GtkWindow" id="list_tools">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
-      <widget class="GtkFrame" id="Tools">
+      <object class="GtkFrame" id="Tools">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">GTK_SHADOW_NONE</property>
         <child>
-          <widget class="GtkAlignment" id="alignment1">
+          <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="left_padding">12</property>
             <child>
-              <widget class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -28,131 +27,122 @@
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
                     <child>
-                      <widget class="GtkTreeView" id="tools_treeview">
+                      <object class="GtkTreeView" id="tools_treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                         <property name="headers_clickable">True</property>
-                        <signal name="row_activated" handler="on_tool_activated"/>
-                      </widget>
+                        <signal handler="on_tool_activated" name="row_activated"/>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkVButtonBox" id="vbuttonbox1">
+                  <object class="GtkVButtonBox" id="vbuttonbox1">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="border_width">5</property>
                     <property name="spacing">5</property>
                     <property name="layout_style">GTK_BUTTONBOX_START</property>
                     <child>
-                      <widget class="GtkButton" id="edit_bt">
+                      <object class="GtkButton" id="edit_bt">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-edit</property>
                         <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_tool_edit"/>
-                      </widget>
+                        <signal handler="on_tool_edit" name="clicked"/>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="add_bt">
+                      <object class="GtkButton" id="add_bt">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-new</property>
                         <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_tool_add"/>
-                      </widget>
+                        <signal handler="on_tool_add" name="clicked"/>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="delete_bt">
+                      <object class="GtkButton" id="delete_bt">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-clear</property>
                         <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_tool_delete"/>
-                      </widget>
+                        <signal handler="on_tool_delete" name="clicked"/>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="up_bt">
+                      <object class="GtkButton" id="up_bt">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-go-up</property>
                         <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_tool_up"/>
-                      </widget>
+                        <signal handler="on_tool_up" name="clicked"/>
+                      </object>
                       <packing>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="down_bt">
+                      <object class="GtkButton" id="down_bt">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label">gtk-go-down</property>
                         <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_tool_down"/>
-                      </widget>
+                        <signal handler="on_tool_down" name="clicked"/>
+                      </object>
                       <packing>
                         <property name="position">4</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="label1">
+        <child type="label">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label" translatable="yes">&lt;b&gt;Tools&lt;/b&gt;</property>
             <property name="use_markup">True</property>
-          </widget>
-          <packing>
-            <property name="type">label_item</property>
-          </packing>
+          </object>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="editor_dialog">
-    <property name="visible">True</property>
+  </object>
+  <object class="GtkDialog" id="editor_dialog">
     <property name="title" translatable="yes">Tool Editor</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_pager_hint">True</property>
-    <signal name="response" handler="on_editor_dialog_response"/>
+    <signal handler="on_editor_dialog_response" name="response"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkTable" id="table2">
+          <object class="GtkTable" id="table2">
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <property name="n_rows">8</property>
@@ -169,128 +159,124 @@
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkLabel" id="label45">
+              <object class="GtkLabel" id="label45">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Name:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="name_entry">
+              <object class="GtkEntry" id="name_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">*</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="enable_checkbox">
+              <object class="GtkCheckButton" id="enable_checkbox">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Enabled</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">5</property>
                 <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="save_checkbox">
+              <object class="GtkCheckButton" id="save_checkbox">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Save all files</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">5</property>
                 <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="terminal_checkbox">
+              <object class="GtkCheckButton" id="terminal_checkbox">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="label" translatable="yes">Run in terminal</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="on_toggle_terminal"/>
-              </widget>
+                <signal handler="on_editor_terminal_toggle" name="toggled"/>
+              </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="right_attach">3</property>
                 <property name="top_attach">5</property>
                 <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox27">
+              <object class="GtkHBox" id="hbox27">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox02">
+                  <object class="GtkHBox" id="hbox02">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkEntry" id="directory_entry">
+                      <object class="GtkEntry" id="directory_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">&#x25CF;</property>
                         <property name="width_request">260</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="browse_button_directory_entry">
+                      <object class="GtkButton" id="browse_button_directory_entry">
                         <property name="label" translatable="yes">Browse...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button22">
+                  <object class="GtkButton" id="button22">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="label" translatable="yes">_Variable...</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_variable_directory"/>
-                  </widget>
+                    <signal handler="on_editor_dir_variable_show" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">4</property>
@@ -301,44 +287,43 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label48">
+              <object class="GtkLabel" id="label48">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Working directory:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">4</property>
                 <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox26">
+              <object class="GtkHBox" id="hbox26">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEntry" id="parameter_entry">
+                  <object class="GtkEntry" id="parameter_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">*</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button20">
+                  <object class="GtkButton" id="button20">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="label" translatable="yes">_Variable...</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_variable_parameter"/>
-                  </widget>
+                    <signal handler="on_editor_param_variable_show" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">4</property>
@@ -349,68 +334,67 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label47">
+              <object class="GtkLabel" id="label47">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Parameters:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label46">
+              <object class="GtkLabel" id="label46">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Command:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label105">
+              <object class="GtkLabel" id="label105">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Short cut:</property>
-              </widget>
+              </object>
               <packing>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkToggleButton" id="shortcut_bt">
+              <object class="GtkToggleButton" id="shortcut_bt">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="use_underline">True</property>
                 <property name="focus_on_click">False</property>
-                <property name="response_id">0</property>
-                <signal name="toggled" handler="on_toggle_shorcut"/>
-              </widget>
+                <signal handler="on_editor_shortcut_toggle" name="toggled"/>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="icon_entry">
+              <object class="GtkButton" id="icon_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <signal name="clicked" handler="on_editor_icon_entry_clicked"/>
-              </widget>
+                <signal handler="on_editor_icon_entry_clicked" name="clicked"/>
+              </object>
               <packing>
                 <property name="left_attach">3</property>
                 <property name="right_attach">4</property>
@@ -420,23 +404,22 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label103">
+              <object class="GtkLabel" id="label103">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams">Standard output:</property>
-              </widget>
+                <property comments="This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams" name="label" translatable="yes">Standard output:</property>
+              </object>
               <packing>
                 <property name="top_attach">7</property>
                 <property name="bottom_attach">8</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBox" id="output_combo">
+              <object class="GtkComboBox" id="output_combo">
                 <property name="visible">True</property>
-                <property name="items" translatable="yes"></property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -447,25 +430,24 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label104">
+              <object class="GtkLabel" id="label104">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams">Standard error:</property>
-              </widget>
+                <property comments="This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams" name="label" translatable="yes">Standard error:</property>
+              </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="right_attach">3</property>
                 <property name="top_attach">7</property>
                 <property name="bottom_attach">8</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBox" id="error_combo">
+              <object class="GtkComboBox" id="error_combo">
                 <property name="visible">True</property>
-                <property name="items" translatable="yes"></property>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">3</property>
                 <property name="right_attach">4</property>
@@ -476,24 +458,23 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label106">
+              <object class="GtkLabel" id="label106">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes" comments="This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams">Standard input:</property>
-              </widget>
+                <property comments="This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams" name="label" translatable="yes">Standard input:</property>
+              </object>
               <packing>
                 <property name="top_attach">6</property>
                 <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="y_options"/>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBox" id="input_combo">
+              <object class="GtkComboBox" id="input_combo">
                 <property name="visible">True</property>
-                <property name="items" translatable="yes"></property>
-                <signal name="changed" handler="on_input_changed"/>
-              </widget>
+                <signal handler="on_editor_input_changed" name="changed"/>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
@@ -504,31 +485,30 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox28">
+              <object class="GtkHBox" id="hbox28">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkEntry" id="input_entry">
+                  <object class="GtkEntry" id="input_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">*</property>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="input_button">
+                  <object class="GtkButton" id="input_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="label" translatable="yes">_Variable...</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
-                    <signal name="clicked" handler="on_variable_input"/>
-                  </widget>
+                    <signal handler="on_editor_input_variable_show" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="right_attach">4</property>
@@ -539,54 +519,53 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox29">
+              <object class="GtkHBox" id="hbox29">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox01">
+                  <object class="GtkHBox" id="hbox01">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkEntry" id="command_entry">
+                      <object class="GtkEntry" id="command_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">&#x25CF;</property>
                         <property name="width_request">260</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="browse_button_command_entry">
+                      <object class="GtkButton" id="browse_button_command_entry">
                         <property name="label" translatable="yes">Browse...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="script_checkbox">
+                  <object class="GtkCheckButton" id="script_checkbox">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip" translatable="yes">Edit command as script in Anjuta on close</property>
+                    <property name="tooltip-text" translatable="yes">Edit command as script in Anjuta on close</property>
                     <property name="label" translatable="yes">Edit as script</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="on_toggle_script"/>
-                  </widget>
+                    <signal handler="on_editor_script_toggle" name="toggled"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">4</property>
@@ -596,113 +575,116 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="cancelbutton1">
+              <object class="GtkButton" id="cancelbutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="okbutton2">
+              <object class="GtkButton" id="okbutton2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-  <widget class="GtkDialog" id="variable_dialog">
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="variable_dialog">
     <property name="width_request">383</property>
     <property name="height_request">255</property>
-    <property name="visible">True</property>
     <property name="title" translatable="yes">Variable list</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_pager_hint">True</property>
-    <signal name="response" handler="on_variable_dialog_response"/>
+    <signal handler="on_variable_dialog_response" name="response"/>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkVBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow17">
+          <object class="GtkScrolledWindow" id="scrolledwindow17">
             <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>
             <child>
-              <widget class="GtkTreeView" id="variable_treeview">
+              <object class="GtkTreeView" id="variable_treeview">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <signal name="row_activated" handler="on_variable_activate_row"/>
-              </widget>
+                <signal handler="on_variable_activate_row" name="row_activated"/>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area5">
+          <object class="GtkHButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="closebutton1">
+              <object class="GtkButton" id="closebutton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-7</property>
-              </widget>
+              </object>
             </child>
             <child>
-              <widget class="GtkButton" id="button17">
+              <object class="GtkButton" id="button17">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="label">gtk-add</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+    <action-widgets>
+      <action-widget response="-7">closebutton1</action-widget>
+      <action-widget response="-5">button17</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/plugins/tools/dialog.c b/plugins/tools/dialog.c
index e1b74f9..94659f0 100644
--- a/plugins/tools/dialog.c
+++ b/plugins/tools/dialog.c
@@ -43,12 +43,12 @@
 #define TOOL_UP_BUTTON "up_bt"
 #define TOOL_DOWN_BUTTON "down_bt"
 
-#define TOOL_ADD_SIGNAL "on_tool_add"
-#define TOOL_ACTIVATED_SIGNAL "on_tool_activated"
-#define TOOL_EDIT_SIGNAL "on_tool_edit"
-#define TOOL_DELETE_SIGNAL "on_tool_delete"
-#define TOOL_UP_SIGNAL "on_tool_up"
-#define TOOL_DOWN_SIGNAL "on_tool_down"
+void on_tool_add (GtkButton *button, gpointer user_data);
+void on_tool_activated (GtkTreeView  *treeview, GtkTreePath *path, GtkTreeViewColumn *col, gpointer user_data);
+void on_tool_edit (GtkButton *button, gpointer user_data);
+void on_tool_delete (GtkButton *button, gpointer user_data);
+void on_tool_up (GtkButton *button, gpointer user_data);
+void on_tool_down (GtkButton *button, gpointer user_data);
 
 /* column of the list view */
 enum {
@@ -123,7 +123,7 @@ get_current_writable_tool (ATPToolDialog *this)
 /* Call backs
  *---------------------------------------------------------------------------*/
 
-static void
+void
 on_tool_add (GtkButton *button, gpointer user_data)
 {
 	ATPToolDialog *this = (ATPToolDialog *)user_data;
@@ -147,7 +147,7 @@ on_tool_add (GtkButton *button, gpointer user_data)
 	atp_tool_editor_show (ted);
 }
 
-static void
+void
 on_tool_edit (GtkButton *button, gpointer user_data)
 {
 	ATPToolDialog *this = (ATPToolDialog *)user_data;
@@ -164,7 +164,7 @@ on_tool_edit (GtkButton *button, gpointer user_data)
 	}
 }
 
-static void
+void
 on_tool_delete (GtkButton *button, gpointer user_data)
 {
 	ATPToolDialog *this = (ATPToolDialog *)user_data;
@@ -181,7 +181,7 @@ on_tool_delete (GtkButton *button, gpointer user_data)
 	}	
 }
 
-static void
+void
 on_tool_up (GtkButton *button, gpointer user_data)
 {
 	ATPToolDialog *this = (ATPToolDialog *)user_data;
@@ -205,7 +205,7 @@ on_tool_up (GtkButton *button, gpointer user_data)
 	}
 }
 
-static void
+void
 on_tool_down (GtkButton *button, gpointer user_data)
 {
 	ATPToolDialog *this = (ATPToolDialog *)user_data;
@@ -243,7 +243,7 @@ on_tool_enable (GtkCellRendererToggle *cell_renderer, const gchar *path, gpointe
 	}	
 }
 
-static void
+void
 on_tool_activated (GtkTreeView  *treeview, GtkTreePath *path, GtkTreeViewColumn *col, gpointer user_data)
 {
 	on_tool_edit (NULL, user_data);
@@ -309,18 +309,18 @@ atp_tool_dialog_refresh (const ATPToolDialog *this, const gchar* select)
 /* Start the tool lister and editor */
 
 void
-atp_tool_dialog_show (ATPToolDialog* this, GladeXML *xml)
+atp_tool_dialog_show (ATPToolDialog* this, GtkBuilder *bxml)
 {
 	GtkTreeModel *model;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *selection;
 
-	this->dialog = GTK_WINDOW (glade_xml_get_widget(xml, TOOL_LIST));
+	this->dialog = GTK_WINDOW (gtk_builder_get_object (bxml, TOOL_LIST));
 	gtk_window_set_transient_for (GTK_WINDOW (this->dialog), atp_plugin_get_app_window (this->plugin));
 
 	/* Create tree view */	
-	this->view = GTK_TREE_VIEW (glade_xml_get_widget(xml, TOOL_TREEVIEW));
+	this->view = GTK_TREE_VIEW (gtk_builder_get_object (bxml, TOOL_TREEVIEW));
 	model = GTK_TREE_MODEL (gtk_list_store_new (ATP_N_TOOLS_COLUMNS,
 		G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER));
 	gtk_tree_view_set_model (this->view, model);
@@ -338,18 +338,13 @@ atp_tool_dialog_show (ATPToolDialog* this, GladeXML *xml)
 	g_object_unref (model);
 
 	/* Get all buttons */
-	this->edit_bt = glade_xml_get_widget(xml, TOOL_EDIT_BUTTON);
-	this->delete_bt = glade_xml_get_widget(xml, TOOL_DELETE_BUTTON);
-	this->up_bt = glade_xml_get_widget(xml, TOOL_UP_BUTTON);
-	this->down_bt = glade_xml_get_widget(xml, TOOL_DOWN_BUTTON);
+	this->edit_bt = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_EDIT_BUTTON));
+	this->delete_bt = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_DELETE_BUTTON));
+	this->up_bt = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_UP_BUTTON));
+	this->down_bt = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_DOWN_BUTTON));
 
 	/* Connect all signals */
-	glade_xml_signal_connect_data (xml, TOOL_ADD_SIGNAL, G_CALLBACK (on_tool_add), this);
-	glade_xml_signal_connect_data (xml, TOOL_ACTIVATED_SIGNAL, G_CALLBACK (on_tool_activated), this);
-	glade_xml_signal_connect_data (xml, TOOL_EDIT_SIGNAL, G_CALLBACK (on_tool_edit), this);
-	glade_xml_signal_connect_data (xml, TOOL_DELETE_SIGNAL, G_CALLBACK (on_tool_delete), this);
-	glade_xml_signal_connect_data (xml, TOOL_UP_SIGNAL, G_CALLBACK (on_tool_up), this);
-	glade_xml_signal_connect_data (xml, TOOL_DOWN_SIGNAL, G_CALLBACK (on_tool_down), this);
+	gtk_builder_connect_signals (bxml, this);
 	selection = gtk_tree_view_get_selection (this->view);
 	this->changed_sig = g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (on_tool_selection_changed), this);
 
diff --git a/plugins/tools/dialog.h b/plugins/tools/dialog.h
index 66fb431..70ccdd5 100644
--- a/plugins/tools/dialog.h
+++ b/plugins/tools/dialog.h
@@ -49,7 +49,7 @@ void atp_tool_dialog_refresh (const ATPToolDialog *this, const gchar* select);
 
 ATPVariable* atp_tool_dialog_get_variable (const ATPToolDialog *this);
 
-void atp_tool_dialog_show (ATPToolDialog *this, GladeXML *xml);
+void atp_tool_dialog_show (ATPToolDialog *this, GtkBuilder *xml);
 void atp_tool_dialog_close (ATPToolDialog *this);
 
 #endif
diff --git a/plugins/tools/editor.c b/plugins/tools/editor.c
index 39b13fc..ecbee5e 100644
--- a/plugins/tools/editor.c
+++ b/plugins/tools/editor.c
@@ -123,21 +123,20 @@ struct _ATPToolEditor
 #define TOOL_ICON "icon_entry"
 #define TOOL_BROWSE_WORKING_DIR "browse_button_directory_entry"
 #define TOOL_BROWSE_COMMAND "browse_button_command_entry"
-
-#define EDITOR_RESPONSE_SIGNAL "on_editor_dialog_response"
-#define EDITOR_PARAM_VARIABLE_SIGNAL "on_variable_parameter"
-#define EDITOR_DIR_VARIABLE_SIGNAL "on_variable_directory"
-#define EDITOR_INPUT_VARIABLE_SIGNAL "on_variable_input"
-#define EDITOR_INPUT_CHANGED_SIGNAL "on_input_changed"
-#define EDITOR_TOGGLE_TERMINAL_SIGNAL "on_toggle_terminal"
-#define EDITOR_TOGGLE_SHORCUT_SIGNAL "on_toggle_shorcut"
-#define EDITOR_TOGGLE_SCRIPT_SIGNAL "on_toggle_script"
-#define EDITOR_ICON_ENTRY_CLICKED "on_editor_icon_entry_clicked"
-
 #define TOOL_VARIABLE "variable_dialog"
 #define VARIABLE_TREEVIEW "variable_treeview"
-#define VARIABLE_RESPONSE_SIGNAL "on_variable_dialog_response"
-#define VARIABLE_ACTIVATE_SIGNAL "on_variable_activate_row"
+
+void on_variable_activate_row (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
+void on_variable_dialog_response (GtkDialog *dialog, gint response, gpointer user_data);
+void on_editor_icon_entry_clicked (GtkButton *button, gpointer user_data);
+void on_editor_terminal_toggle (GtkToggleButton *tb, gpointer user_data);
+void on_editor_script_toggle (GtkToggleButton *tb, gpointer user_data);
+void on_editor_input_changed (GtkComboBox *combo, gpointer user_data);
+void on_editor_dialog_response (GtkDialog *dialog, gint response, gpointer user_data);
+void on_editor_param_variable_show (GtkButton *button, gpointer user_data);
+void on_editor_dir_variable_show (GtkButton *button, gpointer user_data);
+void on_editor_input_variable_show (GtkButton *button, gpointer user_data);
+void on_editor_shortcut_toggle (GtkToggleButton *tb, gpointer user_data);
 
 /* Add helper function
  *---------------------------------------------------------------------------*/
@@ -391,8 +390,8 @@ get_current_name (GtkTreeView *view)
 	return NULL;
 }
 
-static void
-on_variable_activate (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
+void
+on_variable_activate_row (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
 {
 	ATPVariableDialog *this = (ATPVariableDialog*)user_data;
 	GtkTreeIter iter;
@@ -409,8 +408,8 @@ on_variable_activate (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColum
 	gtk_widget_hide (GTK_WIDGET (this->dialog));
 }
 
-static void
-on_variable_response (GtkDialog *dialog, gint response, gpointer user_data)
+void
+on_variable_dialog_response (GtkDialog *dialog, gint response, gpointer user_data)
 {
 	ATPVariableDialog *this = (ATPVariableDialog *)user_data;
 	gchar* name;
@@ -431,10 +430,11 @@ on_variable_response (GtkDialog *dialog, gint response, gpointer user_data)
 static gboolean
 atp_variable_dialog_show (ATPVariableDialog* this, ATPFlags flag)
 {
-	GladeXML *xml;
+	GtkBuilder *bxml = gtk_builder_new ();
 	GtkTreeModel *model;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
+	GError* error = NULL;
 
 	if (this->dialog != NULL)
 	{
@@ -442,18 +442,20 @@ atp_variable_dialog_show (ATPVariableDialog* this, ATPFlags flag)
 		if (this->dialog) gtk_window_present (GTK_WINDOW (this->dialog));
 		return TRUE;
 	}
-	
-	if (NULL == (xml = glade_xml_new(GLADE_FILE, TOOL_VARIABLE, NULL)))
+
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
 	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
 		anjuta_util_dialog_error (GTK_WINDOW (this->editor->dialog), _("Unable to build user interface for tool variable"));
 		return FALSE;
 	}
-	this->dialog = GTK_DIALOG (glade_xml_get_widget(xml, TOOL_VARIABLE));
+	this->dialog = GTK_DIALOG (gtk_builder_get_object (bxml, TOOL_VARIABLE));
 	gtk_widget_show (GTK_WIDGET (this->dialog));
 	gtk_window_set_transient_for (GTK_WINDOW (this->dialog), GTK_WINDOW (this->editor->dialog));
 
 	/* Create variable list */
-	this->view = GTK_TREE_VIEW (glade_xml_get_widget(xml, VARIABLE_TREEVIEW));
+	this->view = GTK_TREE_VIEW (gtk_builder_get_object (bxml, VARIABLE_TREEVIEW));
 	model = GTK_TREE_MODEL (gtk_list_store_new (ATP_N_VARIABLE_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
 	gtk_tree_view_set_model (this->view, model);
 
@@ -469,12 +471,11 @@ atp_variable_dialog_show (ATPVariableDialog* this, ATPFlags flag)
 	g_object_unref (model);
 	atp_variable_dialog_populate (this, flag);
 
-	/* Connect all signals */	
-	glade_xml_signal_connect_data (xml, VARIABLE_RESPONSE_SIGNAL, G_CALLBACK (on_variable_response), this);
-	glade_xml_signal_connect_data (xml, VARIABLE_ACTIVATE_SIGNAL, G_CALLBACK (on_variable_activate), this);
+	/* Connect all signals */
+	gtk_builder_connect_signals (bxml, this);
 	g_signal_connect (G_OBJECT (this->dialog), "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
-	g_object_unref (xml);
+	g_object_unref (bxml);
 
 	return TRUE;
 }
@@ -482,7 +483,7 @@ atp_variable_dialog_show (ATPVariableDialog* this, ATPFlags flag)
 /* Tool editor dialog
  *---------------------------------------------------------------------------*/
 
-static void
+void
 on_editor_icon_entry_clicked (GtkButton *button, gpointer user_data)
 {
 	ATPToolEditor *this = (ATPToolEditor *)user_data;
@@ -643,7 +644,7 @@ atp_populate_tool_editor(ATPToolEditor* this)
 	}
 }
 
-static void
+void
 on_editor_terminal_toggle (GtkToggleButton *tb, gpointer user_data)
 {
 	ATPToolEditor *this = (ATPToolEditor *)user_data;
@@ -651,7 +652,7 @@ on_editor_terminal_toggle (GtkToggleButton *tb, gpointer user_data)
 	atp_update_sensitivity (this);
 }
 
-static void
+void
 on_editor_script_toggle (GtkToggleButton *tb, gpointer user_data)
 {
 	ATPToolEditor *this = (ATPToolEditor *)user_data;
@@ -700,7 +701,7 @@ on_editor_script_toggle (GtkToggleButton *tb, gpointer user_data)
 	}
 }
 
-static void
+void
 on_editor_input_changed (GtkComboBox *combo, gpointer user_data)
 {
 	ATPToolEditor *this = (ATPToolEditor *)user_data;
@@ -708,8 +709,8 @@ on_editor_input_changed (GtkComboBox *combo, gpointer user_data)
 	atp_update_sensitivity (this);
 }
 
-static void
-on_editor_response (GtkDialog *dialog, gint response, gpointer user_data)
+void
+on_editor_dialog_response (GtkDialog *dialog, gint response, gpointer user_data)
 {
 	ATPToolEditor* this = (ATPToolEditor*)user_data;
 	gchar* name;
@@ -875,7 +876,7 @@ on_editor_response (GtkDialog *dialog, gint response, gpointer user_data)
 	atp_tool_editor_free (this);
 }
 
-static void
+void
 on_editor_param_variable_show (GtkButton *button, gpointer user_data)
 {
 	ATPToolEditor* this = (ATPToolEditor*)user_data;
@@ -883,7 +884,7 @@ on_editor_param_variable_show (GtkButton *button, gpointer user_data)
 	atp_variable_dialog_show (&this->param_var, ATP_DEFAULT_VARIABLE);	
 }
 
-static void
+void
 on_editor_dir_variable_show (GtkButton *button, gpointer user_data)
 {
 	ATPToolEditor* this = (ATPToolEditor*)user_data;
@@ -891,7 +892,7 @@ on_editor_dir_variable_show (GtkButton *button, gpointer user_data)
 	atp_variable_dialog_show (&this->dir_var, ATP_DIRECTORY_VARIABLE);
 }
 
-static void
+void
 on_editor_input_variable_show (GtkButton *button, gpointer user_data)
 {
 	ATPToolEditor* this = (ATPToolEditor*)user_data;
@@ -970,7 +971,7 @@ on_editor_get_keys(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 	return TRUE;
 }
 
-static void
+void
 on_editor_shortcut_toggle (GtkToggleButton *tb, gpointer user_data)
 {
 	ATPToolEditor *this = (ATPToolEditor *)user_data;
@@ -1039,7 +1040,8 @@ gboolean
 atp_tool_editor_show (ATPToolEditor* this)
 {
 	GtkWidget *button;
-	GladeXML *xml;
+	GtkBuilder *bxml = gtk_builder_new ();
+	GError* error = NULL;
 
 	if (this->dialog != NULL)
 	{
@@ -1048,41 +1050,42 @@ atp_tool_editor_show (ATPToolEditor* this)
 		return TRUE;
 	}
 
-	if (NULL == (xml = glade_xml_new(GLADE_FILE, TOOL_EDITOR, NULL)))
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
 	{
+		g_warning ("Couldn't load builder file: %s", error->message);
 		anjuta_util_dialog_error (atp_tool_dialog_get_window (this->parent), _("Unable to build user interface for tool editor"));
 		g_free(this);
-
+		g_error_free (error);
 		return FALSE;
 	}
-	this->dialog = glade_xml_get_widget(xml, TOOL_EDITOR);
+	this->dialog = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_EDITOR));
 	gtk_widget_show (this->dialog);
 	gtk_window_set_transient_for (GTK_WINDOW (this->dialog), atp_plugin_get_app_window (this->parent->plugin));
 
-	this->name_en = GTK_EDITABLE (glade_xml_get_widget (xml, TOOL_NAME));
-	this->command_en = GTK_EDITABLE (glade_xml_get_widget (xml, TOOL_COMMAND));
-	this->param_en = GTK_EDITABLE (glade_xml_get_widget (xml, TOOL_PARAM));
+	this->name_en = GTK_EDITABLE (gtk_builder_get_object (bxml, TOOL_NAME));
+	this->command_en = GTK_EDITABLE (gtk_builder_get_object (bxml, TOOL_COMMAND));
+	this->param_en = GTK_EDITABLE (gtk_builder_get_object (bxml, TOOL_PARAM));
 	atp_variable_dialog_set_entry (&this->param_var, this->param_en);
-	this->dir_en = GTK_EDITABLE (glade_xml_get_widget (xml, TOOL_WORKING_DIR));
+	this->dir_en = GTK_EDITABLE (gtk_builder_get_object (bxml, TOOL_WORKING_DIR));
 	atp_variable_dialog_set_entry (&this->dir_var, this->dir_en);
-	this->enabled_tb = GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, TOOL_ENABLED));
-	this->terminal_tb = GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, TOOL_TERMINAL));
-	this->autosave_tb = GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, TOOL_AUTOSAVE));
-	this->script_tb = GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, TOOL_SCRIPT));
-	this->output_com = GTK_COMBO_BOX (glade_xml_get_widget(xml, TOOL_OUTPUT));
-	this->error_com = GTK_COMBO_BOX (glade_xml_get_widget(xml, TOOL_ERROR));
-	this->input_com = GTK_COMBO_BOX (glade_xml_get_widget(xml, TOOL_INPUT));
-	this->input_en = GTK_EDITABLE (glade_xml_get_widget(xml, TOOL_INPUT_VALUE));
-	this->input_var_bt = GTK_BUTTON (glade_xml_get_widget(xml, TOOL_INPUT_VARIABLE));
-	this->shortcut_bt = GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, TOOL_SHORTCUT));
+	this->enabled_tb = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TOOL_ENABLED));
+	this->terminal_tb = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TOOL_TERMINAL));
+	this->autosave_tb = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TOOL_AUTOSAVE));
+	this->script_tb = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TOOL_SCRIPT));
+	this->output_com = GTK_COMBO_BOX (gtk_builder_get_object (bxml, TOOL_OUTPUT));
+	this->error_com = GTK_COMBO_BOX (gtk_builder_get_object (bxml, TOOL_ERROR));
+	this->input_com = GTK_COMBO_BOX (gtk_builder_get_object (bxml, TOOL_INPUT));
+	this->input_en = GTK_EDITABLE (gtk_builder_get_object (bxml, TOOL_INPUT_VALUE));
+	this->input_var_bt = GTK_BUTTON (gtk_builder_get_object (bxml, TOOL_INPUT_VARIABLE));
+	this->shortcut_bt = GTK_TOGGLE_BUTTON (gtk_builder_get_object (bxml, TOOL_SHORTCUT));
 	atp_variable_dialog_set_entry (&this->input_file_var, this->input_en);
 	atp_variable_dialog_set_entry (&this->input_string_var, this->input_en);
-	this->icon_en = GTK_BUTTON (glade_xml_get_widget(xml, TOOL_ICON));
+	this->icon_en = GTK_BUTTON (gtk_builder_get_object (bxml, TOOL_ICON));
 
-	button = GTK_WIDGET (glade_xml_get_widget (xml, TOOL_BROWSE_WORKING_DIR));
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_BROWSE_WORKING_DIR));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 					G_CALLBACK(on_editor_browse_button_dir_clicked), this->dir_en);
-	button = GTK_WIDGET (glade_xml_get_widget (xml, TOOL_BROWSE_COMMAND));
+	button = GTK_WIDGET (gtk_builder_get_object (bxml, TOOL_BROWSE_COMMAND));
 	g_signal_connect(G_OBJECT(button), "clicked", 
 					G_CALLBACK(on_editor_browse_button_clicked), this->command_en);
 
@@ -1095,18 +1098,10 @@ atp_tool_editor_show (ATPToolEditor* this)
 	atp_populate_tool_editor (this);
 	atp_update_sensitivity (this);
 
-	/* Connect all signals */	
-	glade_xml_signal_connect_data (xml, EDITOR_RESPONSE_SIGNAL, G_CALLBACK (on_editor_response), this);
-	glade_xml_signal_connect_data (xml, EDITOR_PARAM_VARIABLE_SIGNAL, G_CALLBACK (on_editor_param_variable_show), this);
-	glade_xml_signal_connect_data (xml, EDITOR_DIR_VARIABLE_SIGNAL, G_CALLBACK (on_editor_dir_variable_show), this);
-	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SHORCUT_SIGNAL, G_CALLBACK (on_editor_shortcut_toggle), this);
-	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_TERMINAL_SIGNAL, G_CALLBACK (on_editor_terminal_toggle), this);
-	glade_xml_signal_connect_data (xml, EDITOR_TOGGLE_SCRIPT_SIGNAL, G_CALLBACK (on_editor_script_toggle), this);
-	glade_xml_signal_connect_data (xml, EDITOR_INPUT_VARIABLE_SIGNAL, G_CALLBACK (on_editor_input_variable_show), this);
-	glade_xml_signal_connect_data (xml, EDITOR_INPUT_CHANGED_SIGNAL, G_CALLBACK (on_editor_input_changed), this);
-	glade_xml_signal_connect_data (xml, EDITOR_ICON_ENTRY_CLICKED, G_CALLBACK (on_editor_icon_entry_clicked), this);
-
-	g_object_unref (xml);
+	/* Connect all signals */
+	gtk_builder_connect_signals (bxml, this);
+
+	g_object_unref (bxml);
 
 	return TRUE;
 }
diff --git a/plugins/tools/plugin.c b/plugins/tools/plugin.c
index 6118a4e..f40bdb2 100644
--- a/plugins/tools/plugin.c
+++ b/plugins/tools/plugin.c
@@ -235,22 +235,26 @@ ipreferences_merge(IAnjutaPreferences* obj, AnjutaPreferences* prefs, GError** e
 {
 	/* Create the tools preferences page */
 	ATPPlugin* atp_plugin;
-	GladeXML *gxml;
+	GtkBuilder *bxml = gtk_builder_new ();
+	GError* error = NULL;
 
 	atp_plugin = ANJUTA_PLUGIN_ATP (obj);
 	atp_plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN(obj)->shell,
 														NULL);
 
 	/* Load glade file */
-	gxml = glade_xml_new (GLADE_FILE, "list_tools", NULL);
-	if (gxml == NULL)
+	if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+	{
+		g_warning ("Couldn't load builder file: %s", error->message);
+		g_error_free (error);
 		return;
+	}
 
-	atp_tool_dialog_show(&atp_plugin->dialog, gxml);
+	atp_tool_dialog_show (&atp_plugin->dialog, bxml);
 
-	anjuta_preferences_add_page (atp_plugin->prefs, gxml,
+	anjuta_preferences_add_from_builder (atp_plugin->prefs, bxml,
 									"Tools", _("Tools"), ICON_FILE);
-	g_object_unref (gxml);
+	g_object_unref (bxml);
 }
 
 static void
