Index: stickynotes/stickynotes.glade
===================================================================
--- stickynotes/stickynotes.glade	(revision 10735)
+++ stickynotes/stickynotes.glade	(working copy)
@@ -1,1670 +1,1067 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
+  <widget class="GtkDialog" id="preferences_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Sticky Notes Preferences</property>
+    <property name="resizable">False</property>
+    <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">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkVBox" id="vbox6">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Default Note Properties&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="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkTable" id="table6">
+                        <property name="visible">True</property>
+                        <property name="n_rows">7</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <widget class="GtkFontButton" id="default_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Choose a font to use for all sticky notes</property>
+                            <property name="response_id">0</property>
+                            <property name="title" translatable="yes">Pick a default sticky note font</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment5">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <widget class="GtkLabel" id="font_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Font:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">default_font</property>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="sys_font_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use fo_nt from the system theme</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <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>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment6">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <widget class="GtkLabel" id="color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Note C_olor:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">default_color</property>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment7">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <widget class="GtkLabel" id="font_color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Font Co_lor:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">font_color</property>
+                              </widget>
+                            </child>
+                          </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">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkColorButton" id="font_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="response_id">0</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkColorButton" id="default_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Choose a base color to use for all sticky notes</property>
+                            <property name="response_id">0</property>
+                            <property name="title" translatable="yes">Pick a default sticky note color</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="sys_color_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use co_lor from the system theme</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <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>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkSpinButton" id="height_spin">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Specify the default height (in pixels) of new notes</property>
+                            <property name="adjustment">1 1 500 10 100 100</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkSpinButton" id="width_spin">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Specify the default width (in pixels) of new notes</property>
+                            <property name="adjustment">1 1 500 10 100 100</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="height_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">H_eight:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">height_spin</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="width_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Width:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">width_spin</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox11">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label31">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Behavior&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="GtkHBox" id="hbox11">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label32">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkTable" id="table7">
+                        <property name="visible">True</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="force_default_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Choose if the default style is forced on all notes</property>
+                            <property name="label" translatable="yes">Force _default color and font on notes</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="sticky_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Choose if notes are visible on all workspaces</property>
+                            <property name="label" translatable="yes">_Put notes on all workspaces</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <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>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <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="helpbutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-11</property>
+              </widget>
+            </child>
+            <child>
+              <widget 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>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="delete_dialog">
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <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-vbox3">
+        <property name="visible">True</property>
+        <property name="spacing">14</property>
+        <child>
+          <widget class="GtkHBox" id="hbox7">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">12</property>
+            <child>
+              <widget class="GtkImage" id="image3">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_size">6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label30">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Delete this sticky note?&lt;/b&gt;
 
-<widget class="GtkDialog" id="preferences_dialog">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Sticky Notes Preferences</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">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="helpbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-help</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">-11</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="closebutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</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">-7</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="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">18</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox6">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label11">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Default Note Properties&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</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>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox1">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label14">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">    </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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table6">
-		      <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">6</property>
-		      <property name="column_spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="width_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Width:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">width_spin</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="height_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">H_eight:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">height_spin</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="width_spin">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Specify the default width (in pixels) of new notes</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 500 10 100 100</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="height_spin">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Specify the default height (in pixels) of new notes</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 500 10 100 100</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="sys_color_check">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Use co_lor from the system theme</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkColorButton" id="default_color">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Choose a base color to use for all sticky notes</property>
-			  <property name="can_focus">True</property>
-			  <property name="use_alpha">False</property>
-			  <property name="title" translatable="yes">Pick a default sticky note color</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkColorButton" id="font_color">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="use_alpha">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment7">
-			  <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">16</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="font_color_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Font Co_lor:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">font_color</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>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment6">
-			  <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">16</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="color_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Note C_olor:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">default_color</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>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="sys_font_check">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Use fo_nt from the system theme</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">5</property>
-			  <property name="bottom_attach">6</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment5">
-			  <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">16</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="font_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Font:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">default_font</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>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">6</property>
-			  <property name="bottom_attach">7</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkFontButton" id="default_font">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Choose a font to use for all sticky notes</property>
-			  <property name="can_focus">True</property>
-			  <property name="title" translatable="yes">Pick a default sticky note font</property>
-			  <property name="show_style">True</property>
-			  <property name="show_size">True</property>
-			  <property name="use_font">False</property>
-			  <property name="use_size">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">6</property>
-			  <property name="bottom_attach">7</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </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">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox11">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label31">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Behavior&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</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>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox11">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label32">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">    </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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table7">
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">12</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="sticky_check">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Choose if notes are visible on all workspaces</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Put notes on all workspaces</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</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="GtkCheckButton" id="force_default_check">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Choose if the default style is forced on all notes</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Force _default color and font on notes</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </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">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="delete_dialog">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox3">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">14</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area3">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <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="button2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-delete</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox7">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkImage" id="image3">
-	      <property name="visible">True</property>
-	      <property name="stock">gtk-dialog-warning</property>
-	      <property name="icon_size">6</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label30">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Delete this sticky note?&lt;/b&gt;
-
 This cannot be undone.</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</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>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="button2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-delete</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="delete_all_dialog">
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <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-vbox4">
+        <property name="visible">True</property>
+        <property name="spacing">14</property>
+        <child>
+          <widget class="GtkHBox" id="hbox8">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">12</property>
+            <child>
+              <widget class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_size">6</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label29">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Delete all sticky notes?&lt;/b&gt;
 
-<widget class="GtkDialog" id="delete_all_dialog">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes"></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">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox4">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">14</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area4">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button3">
-	      <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="button4">
-	      <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>
-	      <property name="response_id">-5</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="hbox4">
-		      <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-delete</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="label19">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Delete All</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>
-	</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="GtkHBox" id="hbox8">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkImage" id="image2">
-	      <property name="visible">True</property>
-	      <property name="stock">gtk-dialog-warning</property>
-	      <property name="icon_size">6</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</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="label29">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Delete all sticky notes?&lt;/b&gt;
-
 This cannot be undone.</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</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>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="stickynote_window">
-  <property name="title" translatable="yes">Sticky Note</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>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox10">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkHBox" id="title_bar">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="lock_button">
-	      <property name="tooltip" translatable="yes">Lock/Unlock note</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NONE</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkImage" id="lock_img">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="title_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</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">2</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">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="close_button">
-	      <property name="tooltip" translatable="yes">Close note</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NONE</property>
-	      <property name="focus_on_click">True</property>
-
-	      <child>
-		<widget class="GtkImage" id="close_img">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTextView" id="body_text">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="has_focus">True</property>
-	  <property name="editable">True</property>
-	  <property name="overwrite">False</property>
-	  <property name="accepts_tab">True</property>
-	  <property name="justification">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap_mode">GTK_WRAP_WORD</property>
-	  <property name="cursor_visible">True</property>
-	  <property name="pixels_above_lines">0</property>
-	  <property name="pixels_below_lines">0</property>
-	  <property name="pixels_inside_wrap">0</property>
-	  <property name="left_margin">4</property>
-	  <property name="right_margin">4</property>
-	  <property name="indent">0</property>
-	  <property name="text" translatable="yes"></property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="resize_bar">
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkEventBox" id="resize_sw_box">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Resize note</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkImage" id="resize_sw_img">
-		  <property name="visible">True</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">1</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEventBox" id="resize_se_box">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Resize note</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkImage" id="resize_se_img">
-		  <property name="visible">True</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">1</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkMenu" id="stickynote_menu">
-
-  <child>
-    <widget class="GtkImageMenuItem" id="popup_create">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_New Note</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image10">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-new</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="popup_destroy">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Delete Note...</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image11">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-delete</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkMenuItem" id="separator1">
-      <property name="visible">True</property>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkCheckMenuItem" id="popup_toggle_lock">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Lock Note</property>
-      <property name="use_underline">True</property>
-      <property name="active">False</property>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkMenuItem" id="separator2">
-      <property name="visible">True</property>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkMenuItem" id="popup_properties">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Properties</property>
-      <property name="use_underline">True</property>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="stickynote_properties">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Sticky Note Properties</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">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="helpbutton2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-help</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">-11</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="closebutton2">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</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">-7</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="vbox12">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">18</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox13">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label35">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Properties&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</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>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox12">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label36">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">    </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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="table8">
-		      <property name="visible">True</property>
-		      <property name="n_rows">6</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label33">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Title:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">title_entry</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="title_entry">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Specify a title for the note</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="def_color_check">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Use default co_lor</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</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="GtkAlignment" id="alignment4">
-			  <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">16</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="font_color_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Font C_olor:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">font_color</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>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkColorButton" id="font_color">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="use_alpha">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <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">16</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="color_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Note _Color:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">note_color</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>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkColorButton" id="note_color">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Choose a color for the note</property>
-			  <property name="can_focus">True</property>
-			  <property name="use_alpha">False</property>
-			  <property name="title" translatable="yes">Pick a color for the sticky note</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="def_font_check">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Use default fo_nt</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <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">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">16</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="font_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Font:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">note_color</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>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">5</property>
-			  <property name="bottom_attach">6</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkFontButton" id="note_font">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Choose a font for the note</property>
-			  <property name="can_focus">True</property>
-			  <property name="title" translatable="yes">Pick a font for the sticky note</property>
-			  <property name="show_style">True</property>
-			  <property name="show_size">True</property>
-			  <property name="use_font">False</property>
-			  <property name="use_size">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<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">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </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">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget 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>
+            </child>
+            <child>
+              <widget class="GtkButton" id="button4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="response_id">-5</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox4">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-delete</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label19">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Delete All</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="stickynote_window">
+    <property name="title" translatable="yes">Sticky Note</property>
+    <child>
+      <widget class="GtkVBox" id="vbox10">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkHBox" id="title_bar">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkButton" id="lock_button">
+                <property name="can_focus">True</property>
+                <property name="tooltip" translatable="yes">Lock/Unlock note</property>
+                <property name="relief">GTK_RELIEF_NONE</property>
+                <property name="response_id">0</property>
+                <child>
+                  <widget class="GtkImage" id="lock_img">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="title_label">
+                <property name="visible">True</property>
+                <property name="xpad">2</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_CENTER</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="close_button">
+                <property name="can_focus">True</property>
+                <property name="tooltip" translatable="yes">Close note</property>
+                <property name="relief">GTK_RELIEF_NONE</property>
+                <property name="response_id">0</property>
+                <child>
+                  <widget class="GtkImage" id="close_img">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkTextView" id="body_text">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="has_focus">True</property>
+            <property name="wrap_mode">GTK_WRAP_WORD</property>
+            <property name="left_margin">4</property>
+            <property name="right_margin">4</property>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHBox" id="resize_bar">
+            <child>
+              <widget class="GtkEventBox" id="resize_sw_box">
+                <property name="visible">True</property>
+                <property name="tooltip" translatable="yes">Resize note</property>
+                <child>
+                  <widget class="GtkImage" id="resize_sw_img">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">1</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEventBox" id="resize_se_box">
+                <property name="visible">True</property>
+                <property name="tooltip" translatable="yes">Resize note</property>
+                <child>
+                  <widget class="GtkImage" id="resize_se_img">
+                    <property name="visible">True</property>
+                    <property name="xalign">1</property>
+                    <property name="yalign">1</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkMenu" id="stickynote_menu">
+    <child>
+      <widget class="GtkImageMenuItem" id="popup_create">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_New Note</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image10">
+            <property name="visible">True</property>
+            <property name="stock">gtk-new</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="popup_destroy">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Delete Note...</property>
+        <property name="use_underline">True</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image11">
+            <property name="visible">True</property>
+            <property name="stock">gtk-delete</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="separator1">
+        <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkCheckMenuItem" id="popup_toggle_lock">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Lock Note</property>
+        <property name="use_underline">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="separator2">
+        <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkMenuItem" id="popup_properties">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Properties</property>
+        <property name="use_underline">True</property>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="stickynote_properties">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Sticky Note Properties</property>
+    <property name="resizable">False</property>
+    <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">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox12">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkVBox" id="vbox13">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label35">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Properties&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="GtkHBox" id="hbox12">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label36">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkTable" id="table8">
+                        <property name="visible">True</property>
+                        <property name="n_rows">6</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <widget class="GtkFontButton" id="note_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Choose a font for the note</property>
+                            <property name="response_id">0</property>
+                            <property name="title" translatable="yes">Pick a font for the sticky note</property>
+                          </widget>
+                          <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>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment2">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <widget class="GtkLabel" id="font_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Font:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">note_color</property>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="def_font_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use default fo_nt</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">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>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkColorButton" id="note_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Choose a color for the note</property>
+                            <property name="response_id">0</property>
+                            <property name="title" translatable="yes">Pick a color for the sticky note</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="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment3">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <widget class="GtkLabel" id="color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Note _Color:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">note_color</property>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkColorButton" id="font_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="response_id">0</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment4">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <widget class="GtkLabel" id="font_color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Font C_olor:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">font_color</property>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="def_color_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use default co_lor</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <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="GtkEntry" id="title_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Specify a title for the note</property>
+                            <property name="invisible_char">*</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label33">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Title:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">title_entry</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="helpbutton2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-11</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="closebutton2">
+                <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>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
Index: stickynotes/stickynotes.ui
===================================================================
--- stickynotes/stickynotes.ui	(revision 0)
+++ stickynotes/stickynotes.ui	(revision 0)
@@ -0,0 +1,1084 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">500</property>
+    <property name="lower">1</property>
+    <property name="page_increment">100</property>
+    <property name="step_increment">10</property>
+    <property name="page_size">100</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">500</property>
+    <property name="lower">1</property>
+    <property name="page_increment">100</property>
+    <property name="step_increment">10</property>
+    <property name="page_size">100</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkUIManager" id="uimanager1">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup1">
+        <child>
+          <object class="GtkAction" id="popup_create">
+            <property name="stock_id">gtk-new</property>
+            <property name="name">popup_create</property>
+            <property name="label" translatable="yes">_New Note</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="popup_destroy">
+            <property name="stock_id">gtk-delete</property>
+            <property name="name">popup_destroy</property>
+            <property name="label" translatable="yes">_Delete Note...</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="popup_toggle_lock">
+            <property name="name">popup_toggle_lock</property>
+            <property name="label" translatable="yes">_Lock Note</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="popup_properties">
+            <property name="name">popup_properties</property>
+            <property name="label" translatable="yes">_Properties</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <popup name="stickynote_menu">
+        <menuitem action="popup_create"/>
+        <menuitem action="popup_destroy"/>
+        <separator/>
+        <menuitem action="popup_toggle_lock"/>
+        <separator/>
+        <menuitem action="popup_properties"/>
+      </popup>
+    </ui>
+  </object>
+  <object class="GtkDialog" id="preferences_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Sticky Notes Preferences</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkVBox" id="vbox6">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Default Note Properties&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>
+                  <object class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkTable" id="table6">
+                        <property name="visible">True</property>
+                        <property name="n_rows">7</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <object class="GtkFontButton" id="default_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Choose a font to use for all sticky notes</property>
+                            <property name="title" translatable="yes">Pick a default sticky note font</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment5">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <object class="GtkLabel" id="font_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Font:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">default_font</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="sys_font_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use fo_nt from the system theme</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </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>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment6">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <object class="GtkLabel" id="color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Note C_olor:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">default_color</property>
+                              </object>
+                            </child>
+                          </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">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment7">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <object class="GtkLabel" id="font_color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Font Co_lor:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">font_color</property>
+                              </object>
+                            </child>
+                          </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">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkColorButton" id="font_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</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="x_options">GTK_FILL</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkColorButton" id="default_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Choose a base color to use for all sticky notes</property>
+                            <property name="title" translatable="yes">Pick a default sticky note color</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="sys_color_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use co_lor from the system theme</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </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"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="height_spin">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Specify the default height (in pixels) of new notes</property>
+                            <property name="adjustment">adjustment1</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</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="GtkSpinButton" id="width_spin">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Specify the default width (in pixels) of new notes</property>
+                            <property name="adjustment">adjustment2</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="height_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">H_eight:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">height_spin</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="GtkLabel" id="width_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Width:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">width_spin</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox11">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label31">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Behavior&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>
+                  <object class="GtkHBox" id="hbox11">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label32">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkTable" id="table7">
+                        <property name="visible">True</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="force_default_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Choose if the default style is forced on all notes</property>
+                            <property name="label" translatable="yes">Force _default color and font on notes</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="sticky_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Choose if notes are visible on all workspaces</property>
+                            <property name="label" translatable="yes">_Put notes on all workspaces</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <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="helpbutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+              </object>
+            </child>
+            <child>
+              <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>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">default_font</action-widget>
+      <action-widget response="0">sys_font_check</action-widget>
+      <action-widget response="0">font_color</action-widget>
+      <action-widget response="0">default_color</action-widget>
+      <action-widget response="0">sys_color_check</action-widget>
+      <action-widget response="0">force_default_check</action-widget>
+      <action-widget response="0">sticky_check</action-widget>
+      <action-widget response="-11">helpbutton1</action-widget>
+      <action-widget response="-7">closebutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="delete_dialog">
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="spacing">14</property>
+        <child>
+          <object class="GtkHBox" id="hbox7">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image3">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_size">6</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label30">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Delete this sticky note?&lt;/b&gt;
+
+This cannot be undone.</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <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>
+              </object>
+            </child>
+            <child>
+              <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-delete</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button1</action-widget>
+      <action-widget response="-5">button2</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="delete_all_dialog">
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="spacing">14</property>
+        <child>
+          <object class="GtkHBox" id="hbox8">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label29">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Delete all sticky notes?&lt;/b&gt;
+
+This cannot be undone.</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <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>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="button4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="xscale">0</property>
+                    <property name="yscale">0</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox4">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <object class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-delete</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label19">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Delete All</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button3</action-widget>
+      <action-widget response="-5">button4</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="stickynote_window">
+    <property name="title" translatable="yes">Sticky Note</property>
+    <child>
+      <object class="GtkVBox" id="vbox10">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkHBox" id="title_bar">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkButton" id="lock_button">
+                <property name="can_focus">True</property>
+                <property name="tooltip-text" translatable="yes">Lock/Unlock note</property>
+                <property name="relief">GTK_RELIEF_NONE</property>
+                <child>
+                  <object class="GtkImage" id="lock_img">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="title_label">
+                <property name="visible">True</property>
+                <property name="xpad">2</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_CENTER</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="close_button">
+                <property name="can_focus">True</property>
+                <property name="tooltip-text" translatable="yes">Close note</property>
+                <property name="relief">GTK_RELIEF_NONE</property>
+                <child>
+                  <object class="GtkImage" id="close_img">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTextView" id="body_text">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="has_focus">True</property>
+            <property name="wrap_mode">GTK_WRAP_WORD</property>
+            <property name="left_margin">4</property>
+            <property name="right_margin">4</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="resize_bar">
+            <child>
+              <object class="GtkEventBox" id="resize_sw_box">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Resize note</property>
+                <child>
+                  <object class="GtkImage" id="resize_sw_img">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">1</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="resize_se_box">
+                <property name="visible">True</property>
+                <property name="tooltip-text" translatable="yes">Resize note</property>
+                <child>
+                  <object class="GtkImage" id="resize_se_img">
+                    <property name="visible">True</property>
+                    <property name="xalign">1</property>
+                    <property name="yalign">1</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" constructor="uimanager1" id="stickynote_menu">
+    
+    
+    
+    
+    
+    
+  </object>
+  <object class="GtkDialog" id="stickynote_properties">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Sticky Note Properties</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox12">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkVBox" id="vbox13">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label35">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Properties&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>
+                  <object class="GtkHBox" id="hbox12">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label36">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkTable" id="table8">
+                        <property name="visible">True</property>
+                        <property name="n_rows">6</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <object class="GtkFontButton" id="note_font">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Choose a font for the note</property>
+                            <property name="title" translatable="yes">Pick a font for the sticky note</property>
+                          </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"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment2">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <object class="GtkLabel" id="font_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Font:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">note_color</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="def_font_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use default fo_nt</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">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="GtkColorButton" id="note_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Choose a color for the note</property>
+                            <property name="title" translatable="yes">Pick a color for the sticky note</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="x_options">GTK_FILL</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment3">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <object class="GtkLabel" id="color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Note _Color:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">note_color</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkColorButton" id="font_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </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"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment4">
+                            <property name="visible">True</property>
+                            <property name="left_padding">16</property>
+                            <child>
+                              <object class="GtkLabel" id="font_color_label">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Font C_olor:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">font_color</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="def_color_check">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Use default co_lor</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <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="GtkEntry" id="title_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip-text" translatable="yes">Specify a title for the note</property>
+                            <property name="invisible_char">*</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label33">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Title:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">title_entry</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="helpbutton2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="closebutton2">
+                <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>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">note_font</action-widget>
+      <action-widget response="0">def_font_check</action-widget>
+      <action-widget response="0">note_color</action-widget>
+      <action-widget response="0">font_color</action-widget>
+      <action-widget response="0">def_color_check</action-widget>
+      <action-widget response="-11">helpbutton2</action-widget>
+      <action-widget response="-7">closebutton2</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: stickynotes/stickynotes_callbacks.c
===================================================================
--- stickynotes/stickynotes_callbacks.c	(revision 10735)
+++ stickynotes/stickynotes_callbacks.c	(working copy)
@@ -112,9 +112,9 @@
 }
 
 /* Popup Menu Callback : Lock/Unlock selected sticky note */
-void popup_toggle_lock_cb(GtkWidget *widget, StickyNote *note)
+void popup_toggle_lock_cb(GtkToggleAction *action, StickyNote *note)
 {
-	stickynote_set_locked(note, gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
+	stickynote_set_locked(note, gtk_toggle_action_get_active(action));
 }
 
 /* Popup Menu Callback : Change sticky note properties */
Index: stickynotes/stickynotes.c
===================================================================
--- stickynotes/stickynotes.c	(revision 10735)
+++ stickynotes/stickynotes.c	(working copy)
@@ -89,67 +89,61 @@
 stickynote_new_aux (GdkScreen *screen, gint x, gint y, gint w, gint h)
 {
 	StickyNote *note;
-	GladeXML *window;
-	GladeXML *menu;
-	GladeXML *properties;
+	GtkBuilder *builder;
 	GtkIconSize size;
 
 	note = g_new (StickyNote, 1);
 
-	/* Load glade file */
-	window = glade_xml_new (GLADE_PATH, "stickynote_window", NULL);
-	menu = glade_xml_new (GLADE_PATH, "stickynote_menu", NULL);
-	properties = glade_xml_new (GLADE_PATH, "stickynote_properties", NULL);
-	if (!window || !menu || !properties)
-		return NULL;
+	builder = gtk_builder_new ();
+	gtk_builder_add_from_file (builder, BUILDER_PATH, NULL);
 
-	note->w_window = glade_xml_get_widget (window, "stickynote_window");
+	note->w_window = GTK_WIDGET (gtk_builder_get_object (builder, "stickynote_window"));
 	gtk_window_set_screen(GTK_WINDOW(note->w_window),screen);
 	gtk_window_set_decorated (GTK_WINDOW (note->w_window), FALSE);
 	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (note->w_window), TRUE);
 	gtk_window_set_skip_pager_hint (GTK_WINDOW (note->w_window), TRUE);
 
-	note->w_title = glade_xml_get_widget(window, "title_label");
-	note->w_body = glade_xml_get_widget(window, "body_text");
-	note->w_lock = glade_xml_get_widget(window, "lock_button");
-	note->w_close = glade_xml_get_widget(window, "close_button");
-	note->w_resize_se = glade_xml_get_widget(window, "resize_se_box");
-	note->w_resize_sw = glade_xml_get_widget(window, "resize_sw_box");
+	note->w_title = GTK_WIDGET (gtk_builder_get_object (builder, "title_label"));
+	note->w_body = GTK_WIDGET (gtk_builder_get_object (builder, "body_text"));
+	note->w_lock = GTK_WIDGET (gtk_builder_get_object (builder, "lock_button"));
+	note->w_close = GTK_WIDGET (gtk_builder_get_object (builder, "close_button"));
+	note->w_resize_se = GTK_WIDGET (gtk_builder_get_object (builder, "resize_se_box"));
+	note->w_resize_sw = GTK_WIDGET (gtk_builder_get_object (builder, "resize_sw_box"));
 	
-	note->img_lock = GTK_IMAGE (glade_xml_get_widget (window,
+	note->img_lock = GTK_IMAGE (gtk_builder_get_object (builder,
 	                "lock_img"));
-	note->img_close = GTK_IMAGE (glade_xml_get_widget (window,
+	note->img_close = GTK_IMAGE (gtk_builder_get_object (builder,
 	                "close_img"));
-	note->img_resize_se = GTK_IMAGE (glade_xml_get_widget (window,
+	note->img_resize_se = GTK_IMAGE (gtk_builder_get_object (builder,
 	                "resize_se_img"));
-	note->img_resize_sw = GTK_IMAGE (glade_xml_get_widget (window,
+	note->img_resize_sw = GTK_IMAGE (gtk_builder_get_object (builder,
 	                "resize_sw_img"));
 
 	/* deal with RTL environments */
-	gtk_widget_set_direction (glade_xml_get_widget (window, "resize_bar"),
+	gtk_widget_set_direction (GTK_WIDGET (gtk_builder_get_object (builder, "resize_bar")),
 			GTK_TEXT_DIR_LTR);
 	
-	note->w_menu = glade_xml_get_widget(menu, "stickynote_menu");
-	note->w_lock_toggle_item = glade_xml_get_widget(menu,
-	        "popup_toggle_lock");
+	note->w_menu = GTK_WIDGET (gtk_builder_get_object (builder, "stickynote_menu"));
+	note->ta_lock_toggle_item = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder,
+	        "popup_toggle_lock"));
 	
-	note->w_properties = glade_xml_get_widget (properties,
-			"stickynote_properties");
+	note->w_properties = GTK_WIDGET (gtk_builder_get_object (builder,
+			"stickynote_properties"));
 	gtk_window_set_screen (GTK_WINDOW (note->w_properties), screen);
 
-	note->w_entry = glade_xml_get_widget (properties, "title_entry");
-	note->w_color = glade_xml_get_widget (properties, "note_color");
-	note->w_color_label = glade_xml_get_widget (properties, "color_label");
-	note->w_font_color = glade_xml_get_widget (properties, "font_color");
-	note->w_font_color_label = glade_xml_get_widget (properties,
-			"font_color_label");
-	note->w_font = glade_xml_get_widget(properties, "note_font");
-	note->w_font_label = glade_xml_get_widget (properties, "font_label");
+	note->w_entry = GTK_WIDGET (gtk_builder_get_object (builder, "title_entry"));
+	note->w_color = GTK_WIDGET (gtk_builder_get_object (builder, "note_color"));
+	note->w_color_label = GTK_WIDGET (gtk_builder_get_object (builder, "color_label"));
+	note->w_font_color = GTK_WIDGET (gtk_builder_get_object (builder, "font_color"));
+	note->w_font_color_label = GTK_WIDGET (gtk_builder_get_object (builder,
+			"font_color_label"));
+	note->w_font = GTK_WIDGET (gtk_builder_get_object (builder, "note_font"));
+	note->w_font_label = GTK_WIDGET (gtk_builder_get_object (builder, "font_label"));
 	note->w_def_color = GTK_WIDGET (&GTK_CHECK_BUTTON (
-				glade_xml_get_widget (properties,
+				gtk_builder_get_object (builder,
 					"def_color_check"))->toggle_button);
 	note->w_def_font = GTK_WIDGET (&GTK_CHECK_BUTTON (
-				glade_xml_get_widget (properties,
+				gtk_builder_get_object (builder,
 					"def_font_check"))->toggle_button);
 
 	note->color = NULL;
@@ -192,7 +186,7 @@
 			STICKYNOTES_STOCK_RESIZE_SW, size);
 	gtk_widget_show(note->w_lock);
 	gtk_widget_show(note->w_close);
-	gtk_widget_show(glade_xml_get_widget(window, "resize_bar"));
+	gtk_widget_show(GTK_WIDGET (gtk_builder_get_object (builder, "resize_bar")));
 
 	/* Customize the title and colors, hide and unlock */
 	stickynote_set_title(note, NULL);
@@ -237,17 +231,17 @@
 	g_signal_connect (G_OBJECT (note->w_window), "delete-event",
 			G_CALLBACK (stickynote_delete_cb), note);
 	
-	g_signal_connect (G_OBJECT (glade_xml_get_widget (menu,
-					"popup_create")), "activate",
+	g_signal_connect (gtk_builder_get_object (builder,
+					"popup_create"), "activate",
 			G_CALLBACK (popup_create_cb), note);
-	g_signal_connect (G_OBJECT (glade_xml_get_widget(menu,
-					"popup_destroy")), "activate",
+	g_signal_connect (gtk_builder_get_object (builder,
+					"popup_destroy"), "activate",
 			G_CALLBACK (popup_destroy_cb), note);
-	g_signal_connect (G_OBJECT (glade_xml_get_widget (menu,
-					"popup_toggle_lock")), "toggled",
+	g_signal_connect (gtk_builder_get_object (builder,
+					"popup_toggle_lock"), "toggled",
 			G_CALLBACK (popup_toggle_lock_cb), note);
-	g_signal_connect (G_OBJECT (glade_xml_get_widget (menu,
-					"popup_properties")), "activate",
+	g_signal_connect (gtk_builder_get_object (builder,
+					"popup_properties"), "activate",
 			G_CALLBACK (popup_properties_cb), note);
 
 	g_signal_connect_swapped (G_OBJECT (note->w_entry), "changed",
@@ -267,10 +261,7 @@
 	g_signal_connect (G_OBJECT (note->w_properties), "delete-event",
 			G_CALLBACK (gtk_widget_hide), note);
 
-	/* unref GladeXML objects */
-	g_object_unref(properties);
-	g_object_unref(menu);
-	g_object_unref(window);
+	g_object_unref(builder);
 
 	g_signal_connect (gtk_text_view_get_buffer(GTK_TEXT_VIEW(note->w_body)),
 			  "changed",
@@ -621,7 +612,7 @@
 		gtk_widget_set_tooltip_text(note->w_lock, _("This note is unlocked."));
 	}
 
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(note->w_lock_toggle_item), locked);
+	gtk_toggle_action_set_active(note->ta_lock_toggle_item, locked);
 
 	stickynotes_applet_update_menus();
 }
@@ -694,14 +685,13 @@
 /* Remove a sticky note with confirmation, if needed */
 void stickynotes_remove(StickyNote *note)
 {
-	GladeXML *glade;
+	GtkBuilder *builder;
 	GtkWidget *dialog;
 
-	glade = glade_xml_new(GLADE_PATH, "delete_dialog", NULL);
-	if (!glade)
-		return;
+	builder = gtk_builder_new ();
+	gtk_builder_add_from_file (builder, BUILDER_PATH, NULL);
 
-	dialog = glade_xml_get_widget(glade, "delete_dialog");
+	dialog = GTK_WIDGET (gtk_builder_get_object (builder, "delete_dialog"));
 
 	gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(note->w_window));
 
@@ -721,7 +711,7 @@
 	}
 
 	gtk_widget_destroy(dialog);
-	g_object_unref(glade);
+	g_object_unref(builder);
 }
 
 /* Save all sticky notes in an XML configuration file */
Index: stickynotes/stickynotes_applet_callbacks.c
===================================================================
--- stickynotes/stickynotes_applet_callbacks.c	(revision 10735)
+++ stickynotes/stickynotes_applet_callbacks.c	(working copy)
@@ -284,8 +284,11 @@
 /* Menu Callback : Destroy all sticky notes */
 void menu_destroy_all_cb(BonoboUIComponent *uic, StickyNotesApplet *applet, const gchar *verbname)
 {
-	GladeXML *glade = glade_xml_new(GLADE_PATH, "delete_all_dialog", NULL);
+	GtkBuilder *builder;
 
+	builder = gtk_builder_new ();
+  	gtk_builder_add_from_file (builder, BUILDER_PATH, NULL);
+
 	if (applet->destroy_all_dialog != NULL) {
 		gtk_window_set_screen (GTK_WINDOW (applet->destroy_all_dialog),
 				       gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)));
@@ -294,9 +297,9 @@
 		return;
 	}
 	
-	applet->destroy_all_dialog = glade_xml_get_widget(glade, "delete_all_dialog");
+	applet->destroy_all_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "delete_all_dialog"));
 
-	g_object_unref (glade);
+	g_object_unref (builder);
 
 	g_signal_connect (applet->destroy_all_dialog, "response",
 			  G_CALLBACK (destroy_all_response_cb),
Index: stickynotes/stickynotes_callbacks.h
===================================================================
--- stickynotes/stickynotes_callbacks.h	(revision 10735)
+++ stickynotes/stickynotes_callbacks.h	(working copy)
@@ -34,7 +34,7 @@
 /* Callbacks for the sticky notes popup menu */
 void popup_create_cb(GtkWidget *widget, StickyNote *note);
 void popup_destroy_cb(GtkWidget *widget, StickyNote *note);
-void popup_toggle_lock_cb(GtkWidget *widget, StickyNote *note);
+void popup_toggle_lock_cb(GtkToggleAction *action, StickyNote *note);
 void popup_properties_cb(GtkWidget *widget, StickyNote *note);
 
 /* Callbacks for sticky notes properties dialog */
Index: stickynotes/stickynotes_applet.c
===================================================================
--- stickynotes/stickynotes_applet.c	(revision 10735)
+++ stickynotes/stickynotes_applet.c	(working copy)
@@ -207,35 +207,37 @@
 
 void stickynotes_applet_init_prefs(void)
 {
-	stickynotes->prefs = glade_xml_new (GLADE_PATH, "preferences_dialog",
-			NULL);
 
-	stickynotes->w_prefs = glade_xml_get_widget (stickynotes->prefs,
-			"preferences_dialog");
+	stickynotes->builder = gtk_builder_new ();
+
+        gtk_builder_add_from_file (stickynotes->builder, BUILDER_PATH, NULL);
+
+	stickynotes->w_prefs = GTK_WIDGET (gtk_builder_get_object (stickynotes->builder,
+			"preferences_dialog"));
+
 	stickynotes->w_prefs_width = gtk_spin_button_get_adjustment (
-			GTK_SPIN_BUTTON (glade_xml_get_widget (
-					stickynotes->prefs, "width_spin")));
+			GTK_SPIN_BUTTON (gtk_builder_get_object (
+                                         stickynotes->builder, "width_spin")));
 	stickynotes->w_prefs_height = gtk_spin_button_get_adjustment (
-			GTK_SPIN_BUTTON (glade_xml_get_widget (
-					stickynotes->prefs, "height_spin")));
-	stickynotes->w_prefs_color = glade_xml_get_widget (stickynotes->prefs,
-			"default_color");
-	stickynotes->w_prefs_font_color = glade_xml_get_widget (
-			stickynotes->prefs,
-			"font_color");
+			GTK_SPIN_BUTTON (gtk_builder_get_object (
+                                         stickynotes->builder, "height_spin")));
+	stickynotes->w_prefs_color = GTK_WIDGET (gtk_builder_get_object (stickynotes->builder,
+			"default_color"));
+	stickynotes->w_prefs_font_color = GTK_WIDGET (gtk_builder_get_object (stickynotes->builder,
+			"font_color"));
 	stickynotes->w_prefs_sys_color = GTK_WIDGET (&GTK_CHECK_BUTTON (
-				glade_xml_get_widget (stickynotes->prefs,
+				        gtk_builder_get_object (stickynotes->builder,
 					"sys_color_check"))->toggle_button);
-	stickynotes->w_prefs_font = glade_xml_get_widget (stickynotes->prefs,
-			"default_font");
+	stickynotes->w_prefs_font = GTK_WIDGET (gtk_builder_get_object (stickynotes->builder,
+			"default_font"));
 	stickynotes->w_prefs_sys_font = GTK_WIDGET (&GTK_CHECK_BUTTON (
-				glade_xml_get_widget (stickynotes->prefs,
+				        gtk_builder_get_object (stickynotes->builder,
 					"sys_font_check"))->toggle_button);
 	stickynotes->w_prefs_sticky = GTK_WIDGET (&GTK_CHECK_BUTTON (
-				glade_xml_get_widget (stickynotes->prefs,
+				        gtk_builder_get_object (stickynotes->builder,
 					"sticky_check"))->toggle_button);
 	stickynotes->w_prefs_force = GTK_WIDGET (&GTK_CHECK_BUTTON (
-				glade_xml_get_widget (stickynotes->prefs,
+				        gtk_builder_get_object (stickynotes->builder,
 					"force_default_check"))->toggle_button);
 
 	g_signal_connect (G_OBJECT (stickynotes->w_prefs), "response",
@@ -267,9 +269,9 @@
 	{
 		GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-		gtk_size_group_add_widget(group, glade_xml_get_widget(stickynotes->prefs, "width_label"));
-		gtk_size_group_add_widget(group, glade_xml_get_widget(stickynotes->prefs, "height_label"));
-		gtk_size_group_add_widget(group, glade_xml_get_widget(stickynotes->prefs, "color_label"));
+		gtk_size_group_add_widget(group, GTK_WIDGET (gtk_builder_get_object (stickynotes->builder, "width_label")));
+		gtk_size_group_add_widget(group, GTK_WIDGET (gtk_builder_get_object (stickynotes->builder, "height_label")));
+		gtk_size_group_add_widget(group, GTK_WIDGET (gtk_builder_get_object (stickynotes->builder, "color_label")));
 
 		g_object_unref(group);
 	}
@@ -277,36 +279,36 @@
 	if (!gconf_client_key_is_writable(stickynotes->gconf,
 				GCONF_PATH "/defaults/width", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "width_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "width_label")),
 				FALSE);
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "width_spin"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "width_spin")),
 				FALSE);
 	}
 	if (!gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/height", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "height_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "height_label")),
 				FALSE);
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "height_spin"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "height_spin")),
 				FALSE);
 	}
 	if (!gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/color", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "color_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "color_label")),
 				FALSE);
 		gtk_widget_set_sensitive (stickynotes->w_prefs_color, FALSE);
 	}
 	if (!gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/font_color", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "font_color_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "font_color_label")),
 				FALSE);
 		gtk_widget_set_sensitive (stickynotes->w_prefs_font_color,
 				FALSE);
@@ -318,8 +320,8 @@
 	if (!gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/font", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-					stickynotes->prefs, "font_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+					stickynotes->builder, "font_label")),
 				FALSE);
 		gtk_widget_set_sensitive (stickynotes->w_prefs_font, FALSE);
 	}
@@ -521,8 +523,8 @@
 	if (gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/color", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-				stickynotes->prefs, "color_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+				stickynotes->builder, "color_label")),
 				!sys_color);
 		gtk_widget_set_sensitive (stickynotes->w_prefs_color,
 				!sys_color);
@@ -530,8 +532,8 @@
 	if (gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/font_color", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-				stickynotes->prefs, "font_color_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+				stickynotes->builder, "font_color_label")),
 				!sys_color);
 		gtk_widget_set_sensitive (stickynotes->w_prefs_font_color,
 				!sys_color);
@@ -539,8 +541,8 @@
 	if (gconf_client_key_is_writable (stickynotes->gconf,
 				GCONF_PATH "/defaults/font", NULL))
 	{
-		gtk_widget_set_sensitive (glade_xml_get_widget (
-				stickynotes->prefs, "font_label"),
+		gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (
+				stickynotes->builder, "font_label")),
 				!sys_font);
 		gtk_widget_set_sensitive (stickynotes->w_prefs_font,
 				!sys_font);
Index: stickynotes/stickynotes.h
===================================================================
--- stickynotes/stickynotes.h	(revision 10735)
+++ stickynotes/stickynotes.h	(working copy)
@@ -47,7 +47,7 @@
 	GtkWidget *w_resize_se;		/* Sticky Note resize button (south east) */
 	GtkWidget *w_resize_sw;		/* Sticky Note resize button (south west) */
 
-	GtkWidget *w_lock_toggle_item;	/* Lock item in the popup menu */
+	GtkToggleAction *ta_lock_toggle_item; /* Lock item in the popup menu */
 
 	GtkImage *img_lock;		/* Lock image */
 	GtkImage *img_close;		/* Close image */
Index: stickynotes/Makefile.am
===================================================================
--- stickynotes/Makefile.am	(revision 10735)
+++ stickynotes/Makefile.am	(working copy)
@@ -3,7 +3,7 @@
 SUBDIRS = pixmaps docs data
 
 ui_files = GNOME_StickyNotesApplet.xml
-glade_files = stickynotes.glade
+builder_files = stickynotes.ui
 server_in_files = GNOME_StickyNotesApplet.server.in
 schemas_in_files = stickynotes.schemas.in
 
@@ -12,7 +12,6 @@
 	-I.					\
 	-I$(srcdir)				\
 	$(GNOME_APPLETS_CFLAGS)			\
-	$(LIBGLADE_CFLAGS)			\
 	$(LIBWNCK_CFLAGS)			\
 	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
 
@@ -32,10 +31,9 @@
 
 stickynotes_applet_LDADD =	\
 	$(GNOME_APPLETS_LIBS)	\
-	$(LIBGLADE_LIBS)	\
 	$(LIBWNCK_LIBS)
 
-glade_DATA = $(glade_files)
+builder_DATA = $(builder_files)
 
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = $(ui_files)
@@ -64,7 +62,7 @@
 endif
 
 EXTRA_DIST = \
-	     $(glade_files) \
+	     $(builder_files) \
 	     $(ui_files) \
 	     $(schemas_in_files) \
 	     GNOME_StickyNotesApplet.server.in.in
Index: stickynotes/stickynotes_applet.h
===================================================================
--- stickynotes/stickynotes_applet.h	(revision 10735)
+++ stickynotes/stickynotes_applet.h	(working copy)
@@ -24,13 +24,13 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkwidget.h>
-#include <glade/glade-xml.h>
+#include <gtk/gtkbuilder.h>
 #include <panel-applet.h>
 #include <gconf/gconf-client.h>
-#include <glade/glade.h>
 
+
 #define GCONF_PATH	"/apps/stickynotes_applet"
-#define GLADE_PATH	GNOME_GLADEDIR "/stickynotes.glade"
+#define BUILDER_PATH	GTK_BUILDERDIR "/stickynotes.ui"
 #define XML_PATH	"/.gnome2/stickynotes_applet"
 #define ICON_PATH	STICKYNOTES_ICONDIR
 
@@ -43,7 +43,7 @@
 /* Global Sticky Notes instance */
 typedef struct
 {
-	GladeXML *prefs;		/* Preferences dialog GladeXML */
+	GtkBuilder *builder;		
 
 	GtkWidget *w_prefs;		/* The prefs dialog */
 	GtkAdjustment *w_prefs_width;
Index: trashapplet/src/trash-empty.c
===================================================================
--- trashapplet/src/trash-empty.c	(revision 10735)
+++ trashapplet/src/trash-empty.c	(working copy)
@@ -244,7 +244,7 @@
 
   builder = gtk_builder_new ();
   gtk_builder_add_from_file (builder,
-                             GNOME_GLADEDIR "/trashapplet-empty-progress.ui",
+                             GTK_BUILDERDIR "/trashapplet-empty-progress.ui",
                              NULL);
 
   for (i = 0; i < G_N_ELEMENTS (widgets); i++)
Index: trashapplet/Makefile.am
===================================================================
--- trashapplet/Makefile.am	(revision 10735)
+++ trashapplet/Makefile.am	(working copy)
@@ -12,12 +12,11 @@
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_Panel_TrashApplet.xml
 
-# here for now until i here of a better place
-glade_DATA = trashapplet-empty-progress.ui
+builder_DATA = trashapplet-empty-progress.ui
 
 EXTRA_DIST = \
 	$(ui_DATA) \
 	GNOME_Panel_TrashApplet.server.in.in \
-	$(glade_DATA)
+	$(builder_DATA)
 
 CLEANFILES = $(server_in_files) $(server_DATA)
Index: gswitchit/gswitchit.ui
===================================================================
--- gswitchit/gswitchit.ui	(revision 0)
+++ gswitchit/gswitchit.ui	(revision 0)
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkDialog" id="gswitchit_layout_view">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Keyboard Layout</property>
+    <property name="resizable">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="preview_vbox">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">18</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <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="btnPrint">
+                <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-print</property>
+                <property name="use_stock">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnHelp">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnClose">
+                <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>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="2">btnPrint</action-widget>
+      <action-widget response="-11">btnHelp</action-widget>
+      <action-widget response="-7">btnClose</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: gswitchit/Makefile.am
===================================================================
--- gswitchit/Makefile.am	(revision 10735)
+++ gswitchit/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 	$(server_in_in_files) \
         $(ui_DATA) \
         $(pixmap_DATA) \
-        $(glade_DATA)
+        $(builder_DATA)
 
 libexec_PROGRAMS = gnome-keyboard-applet
 noinst_LIBRARIES = libgswitchit-applet.a
@@ -24,12 +24,10 @@
 	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
 	$(LIBGNOMEKBDUI_CFLAGS)		\
 	$(GNOME_APPLETS_CFLAGS)		\
-	$(LIBGLADE_CFLAGS)		\
 	$(flags_CFLAGS)	
 
 COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
-	      $(GNOME_APPLETS_LIBS) \
-	      $(LIBGLADE_LIBS) 
+	      $(GNOME_APPLETS_LIBS)
 
 libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
 
@@ -59,5 +57,5 @@
 pixmapdir = $(datadir)/icons/hicolor/48x48/apps
 pixmap_DATA = gswitchit-applet.png gswitchit-properties-capplet.png
 
-glade_DATA = gswitchit.glade
+builder_DATA = gswitchit.ui
 
Index: gswitchit/gswitchit-applet.c
===================================================================
--- gswitchit/gswitchit-applet.c	(revision 10735)
+++ gswitchit/gswitchit-applet.c	(working copy)
@@ -30,7 +30,6 @@
 
 #include <gdk/gdkscreen.h>
 #include <gdk/gdkx.h>
-#include <glade/glade.h>
 #include <libgnomeui/gnome-help.h>
 
 #define GROUPS_SUBMENU_PATH "/popups/popup/groups"
@@ -268,10 +267,10 @@
 static void
 GSwitchItPreviewDestroy (GtkWidget * dialog, gint group)
 {
-	GladeXML *gladeData =
-	    GLADE_XML (gtk_object_get_data
-		       (GTK_OBJECT (dialog), "gladeData"));
-	g_object_unref (G_OBJECT (gladeData));
+	GtkBuilder *builder =
+	    GTK_BUILDER (gtk_object_get_data
+		       (GTK_OBJECT (dialog), "builderData"));
+	g_object_unref (G_OBJECT (builder));
 	g_hash_table_remove (globals.previewDialogs,
 			     GINT_TO_POINTER (group));
 }
@@ -293,7 +292,7 @@
 		groupsLevels + 3
 	};
 #ifdef HAVE_XKB
-	GladeXML *gladeData;
+	GtkBuilder *builder;
 	GtkWidget *dialog, *kbdraw;
 	XkbComponentNamesRec componentNames;
 	XklConfigRec *xklData;
@@ -311,10 +310,18 @@
 		return;
 	}
 #ifdef HAVE_XKB
-	gladeData =
-	    glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade",
-			   "gswitchit_layout_view", NULL);
-	dialog = glade_xml_get_widget (gladeData, "gswitchit_layout_view");
+	GError *error = NULL;
+
+	builder = gtk_builder_new ();
+	gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/gswitchit.ui", &error);
+
+	if (error) {
+		g_error ("building ui from %s failed: %s", GTK_BUILDERDIR "/gswitchit.ui", error->message);
+    		g_clear_error (&error);
+  	}
+
+
+	dialog = GTK_WIDGET (gtk_builder_get_object (builder, "gswitchit_layout_view"));
 	kbdraw = gkbd_keyboard_drawing_new ();
 
 	if (xklState->group >= 0 &&
@@ -377,7 +384,7 @@
 	}
 	g_object_unref (G_OBJECT (xklData));
 
-	gtk_object_set_data (GTK_OBJECT (dialog), "gladeData", gladeData);
+	gtk_object_set_data (GTK_OBJECT (dialog), "builderData", builder);
 	g_signal_connect (GTK_OBJECT (dialog),
 			  "destroy", G_CALLBACK (GSwitchItPreviewDestroy),
 			  GINT_TO_POINTER (xklState->group));
@@ -396,8 +403,8 @@
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
 	gtk_container_add (GTK_CONTAINER
-			   (glade_xml_get_widget
-			    (gladeData, "preview_vbox")), kbdraw);
+			   (gtk_builder_get_object (builder, "preview_vbox")), 
+                            kbdraw);
 
 	gtk_object_set_data (GTK_OBJECT (dialog), "kbdraw", kbdraw);
 
Index: cpufreq/cpufreq-preferences.ui
===================================================================
--- cpufreq/cpufreq-preferences.ui	(revision 0)
+++ cpufreq/cpufreq-preferences.ui	(revision 0)
@@ -0,0 +1,401 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkDialog" id="prefs_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">CPU Frequency Monitor Preferences</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">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="prefs_dialog_vbox">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="helpbutton2">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</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="closebutton2">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</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="vbox4">
+            <property name="border_width">5</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkVBox" id="monitor_settings_box">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label12">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Monitor Settings&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</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>
+                <child>
+                  <object class="GtkHBox" id="hbox9">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </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>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox6">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="label14">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Monitored CPU:</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="mnemonic_widget">prefs_cpu_number</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>
+                        <child>
+                          <object class="GtkComboBox" id="prefs_cpu_number">
+                            <property name="visible">True</property>
+                            <property name="add_tearoffs">False</property>
+                            <property name="focus_on_click">True</property>
+                          </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>
+                  <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">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="display_settings_box">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label13">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Display Settings&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</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>
+                <child>
+                  <object class="GtkHBox" id="hbox11">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkLabel" id="label20">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </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>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox5">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox7">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkLabel" id="label15">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Appearance:</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="mnemonic_widget">prefs_show_mode</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">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="prefs_show_mode">
+                                <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
+                              </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">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="prefs_show_freq">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Show CPU frequency as _frequency</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <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">18</property>
+                            <property name="right_padding">0</property>
+                            <child>
+                              <object class="GtkCheckButton" id="prefs_show_unit">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Show frequency _units</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="prefs_show_perc">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Show CPU frequency as _percentage</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">prefs_show_freq</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</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>
+                  <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">False</property>
+                <property name="fill">False</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="-11">helpbutton2</action-widget>
+      <action-widget response="-7">closebutton2</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: cpufreq/src/cpufreq-prefs.c
===================================================================
--- cpufreq/src/cpufreq-prefs.c	(revision 10735)
+++ cpufreq/src/cpufreq-prefs.c	(working copy)
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-help.h>
 #include <gconf/gconf-client.h>
-#include <glade/glade.h>
 
 #include "cpufreq-prefs.h"
 #include "cpufreq-utils.h"
@@ -638,28 +637,24 @@
 static void
 cpufreq_prefs_dialog_create (CPUFreqPrefs *prefs)
 {
-	GladeXML *xml = NULL;
-	gchar    *glade_file;
+	GtkBuilder *builder;
 
-	glade_file = g_build_filename (GNOME_GLADEDIR,
-				       "cpufreq-preferences.glade",
-				       NULL);
-	xml = glade_xml_new (glade_file, "prefs_dialog", NULL);
-	g_free (glade_file);
-	
-	prefs->priv->dialog = glade_xml_get_widget (xml, "prefs_dialog");
+	builder = gtk_builder_new ();
+	gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/cpufreq-preferences.ui", NULL);
 
-	prefs->priv->cpu_combo = glade_xml_get_widget (xml, "prefs_cpu_number");
+	prefs->priv->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
+
+	prefs->priv->cpu_combo = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_cpu_number"));
 	
-	prefs->priv->show_mode_combo = glade_xml_get_widget (xml, "prefs_show_mode");
+	prefs->priv->show_mode_combo = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_mode"));
 	
-	prefs->priv->show_freq = glade_xml_get_widget (xml, "prefs_show_freq");
-	prefs->priv->show_unit = glade_xml_get_widget (xml, "prefs_show_unit");
-	prefs->priv->show_perc = glade_xml_get_widget (xml, "prefs_show_perc");
+	prefs->priv->show_freq = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_freq"));
+	prefs->priv->show_unit = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_unit"));
+	prefs->priv->show_perc = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_show_perc"));
 
-	prefs->priv->monitor_settings_box = glade_xml_get_widget (xml, "monitor_settings_box");
+	prefs->priv->monitor_settings_box = GTK_WIDGET (gtk_builder_get_object (builder, "monitor_settings_box"));
 
-	g_object_unref (xml);
+	g_object_unref (builder);
 
 	cpufreq_prefs_dialog_show_mode_combo_setup (prefs);
 	
Index: cpufreq/src/cpufreq-applet.c
===================================================================
--- cpufreq/src/cpufreq-applet.c	(revision 10735)
+++ cpufreq/src/cpufreq-applet.c	(working copy)
@@ -35,7 +35,6 @@
 #include <libgnomeui/gnome-help.h>
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
-#include <glade/glade.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
Index: cpufreq/Makefile.am
===================================================================
--- cpufreq/Makefile.am	(revision 10735)
+++ cpufreq/Makefile.am	(working copy)
@@ -16,7 +16,7 @@
 
 @INTLTOOL_SERVER_RULE@
 
-glade_DATA = cpufreq-preferences.glade
+builder_DATA = cpufreq-preferences.ui
 
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_CPUFreqApplet.xml
@@ -36,7 +36,7 @@
 EXTRA_DIST = \
 	     $(server_in_in_files)           \
 	     $(schemas_in_files)             \
-	     $(glade_DATA)                   \
+	     $(builder_DATA)                 \
 	     $(ui_DATA)
 	     
 					
Index: battstat/battstat_applet.ui
===================================================================
--- battstat/battstat_applet.ui	(revision 0)
+++ battstat/battstat_applet.ui	(revision 0)
@@ -0,0 +1,568 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">25</property>
+    <property name="lower">1</property>
+    <property name="page_increment">5</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">5</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkDialog" id="battstat_properties">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Battery Charge Monitor Preferences</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_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog_vbox">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</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="button2">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</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="vbox6">
+            <property name="border_width">5</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkVBox" id="vbox17">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label15">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Appearance&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</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>
+                <child>
+                  <object class="GtkHBox" id="hbox8">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkLabel" id="label21">
+                        <property name="visible">True</property>
+                        <property name="label">    </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>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox19">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox21">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
+                            <child>
+                              <object class="GtkRadioButton" id="battery_view">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Compact view</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">True</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</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="label24">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;small&gt;(shows single image for status and charge)&lt;/small&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</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">24</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>
+                            <child>
+                              <object class="GtkRadioButton" id="battery_view_2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Expanded view</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">battery_view</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="label25">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;small&gt;(two images: one for status, one for charge)&lt;/small&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</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">24</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>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox22">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="show_text_remaining">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Show time/percentage:</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">True</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox9">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">0</property>
+                                <child>
+                                  <object class="GtkLabel" id="label22">
+                                    <property name="visible">True</property>
+                                    <property name="label">    </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>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" id="vbox20">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkRadioButton" id="show_text_radio">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Show _time remaining</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                                        <property name="focus_on_click">True</property>
+                                        <property name="active">False</property>
+                                        <property name="inconsistent">False</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="show_text_radio_2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Show _percentage remaining</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                                        <property name="focus_on_click">True</property>
+                                        <property name="active">False</property>
+                                        <property name="inconsistent">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">show_text_radio</property>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </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>
+                          <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">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox12">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label18">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Notifications&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</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>
+                <child>
+                  <object class="GtkHBox" id="hbox5">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="label">    </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>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox13">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="lowbatt_toggle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property comments="TRANSLATOR: This is the beginning of the sentence 'Warn when battery charge drops to: [XX] percent/minutes remaining'" name="label" translatable="yes">_Warn when battery charge drops to:</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox_ptr">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkLabel" id="label23">
+                                <property name="visible">True</property>
+                                <property name="label">    </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>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="spin_ptr">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">0</property>
+                                <property name="numeric">False</property>
+                                <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                <property name="snap_to_ticks">False</property>
+                                <property name="wrap">False</property>
+                                <property name="adjustment">adjustment1</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="combo_ptr">
+                                <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
+                              </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>
+                        <child>
+                          <object class="GtkCheckButton" id="full_toggle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Notify when battery is fully recharged</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </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>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</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="-11">button1</action-widget>
+      <action-widget response="-7">button2</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: battstat/Makefile.am
===================================================================
--- battstat/Makefile.am	(revision 10735)
+++ battstat/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-glade_DATA = battstat_applet.glade
+builder_DATA = battstat_applet.ui
 
 ACPIINC= @ACPIINC@
 
@@ -25,7 +25,6 @@
 
 INCLUDES =					\
 	$(GNOME_APPLETS_CFLAGS)			\
-	$(LIBGLADE_CFLAGS)			\
 	$(LIBNOTIFY_CFLAGS)			\
 	$(HAL_CFLAGS)				\
 	$(APMINC)				\
@@ -52,7 +51,6 @@
 
 battstat_applet_2_LDADD = \
 		     $(GNOME_APPLETS_LIBS) \
-		     $(LIBGLADE_LIBS) \
 		     $(LIBNOTIFY_LIBS) \
 		     $(HAL_LIBS) \
 		     $(APMLIB)
@@ -81,7 +79,7 @@
 ui_DATA = GNOME_BattstatApplet.xml
 
 EXTRA_DIST = 			\
-	$(glade_DATA)		\
+	$(builder_DATA)		\
 	$(ui_DATA)		\
 	GNOME_BattstatApplet.server.in.in	\
 	$(schemas_in_files)
Index: battstat/battstat_applet.c
===================================================================
--- battstat/battstat_applet.c	(revision 10735)
+++ battstat/battstat_applet.c	(working copy)
@@ -41,8 +41,6 @@
 
 #include <libgnomeui/libgnomeui.h>
 
-#include <glade/glade.h>
-
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
@@ -321,7 +319,6 @@
 
   allocate_battery_colours();
   initialise_global_pixmaps();
-  glade_init();
   err = power_management_initialise (no_hal, status_change_callback);
 
   return err;
Index: battstat/properties.c
===================================================================
--- battstat/properties.c	(revision 10735)
+++ battstat/properties.c	(working copy)
@@ -42,8 +42,6 @@
 
 #include <gtk/gtk.h>
 
-#include <glade/glade.h>
-
 #include <gconf/gconf-client.h>
 
 #include <libgnome/libgnome.h>
@@ -253,7 +251,7 @@
 	 ProgressData      *battstat,
 	 const char        *verb)
 {
-  GladeXML  *glade_xml;
+  GtkBuilder *builder;
   GtkWidget *combo_ptr, *spin_ptr;
   GConfClient *client;
   GtkListStore *liststore;
@@ -274,10 +272,10 @@
      return;
    } 
 
-  glade_xml = glade_xml_new (GNOME_GLADEDIR "/battstat_applet.glade", 
-                             "battstat_properties", NULL);
-  
-  battstat->prop_win = GTK_DIALOG (glade_xml_get_widget (glade_xml, 
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_file (builder, GTK_BUILDERDIR"/battstat_applet.ui", NULL);
+
+  battstat->prop_win = GTK_DIALOG (gtk_builder_get_object (builder, 
   				   "battstat_properties"));
   gtk_window_set_screen (GTK_WINDOW (battstat->prop_win),
 			 gtk_widget_get_screen (battstat->applet));
@@ -285,7 +283,7 @@
   g_signal_connect (G_OBJECT (battstat->prop_win), "delete_event",
 		  G_CALLBACK (gtk_true), NULL);
   
-  battstat->lowbatt_toggle = glade_xml_get_widget (glade_xml, "lowbatt_toggle");
+  battstat->lowbatt_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "lowbatt_toggle"));
   g_signal_connect (G_OBJECT (battstat->lowbatt_toggle), "toggled",
   		    G_CALLBACK (lowbatt_toggled), battstat);
 
@@ -295,10 +293,10 @@
 	  hard_set_sensitive (battstat->lowbatt_toggle, FALSE);
   }
 
-  battstat->hbox_ptr = glade_xml_get_widget (glade_xml, "hbox_ptr");
+  battstat->hbox_ptr = GTK_WIDGET (gtk_builder_get_object (builder, "hbox_ptr"));
   hard_set_sensitive (battstat->hbox_ptr, battstat->lowbattnotification);
 
-  combo_ptr = glade_xml_get_widget (glade_xml, "combo_ptr");
+  combo_ptr = GTK_WIDGET (gtk_builder_get_object (builder, "combo_ptr"));
   g_signal_connect (G_OBJECT (combo_ptr), "changed",
 		  G_CALLBACK (combo_ptr_cb), battstat);
 
@@ -326,7 +324,7 @@
    */
   gtk_list_store_set (liststore, &iter, 0, _("Minutes Remaining"), -1);
 
-  spin_ptr = glade_xml_get_widget (glade_xml, "spin_ptr");
+  spin_ptr = GTK_WIDGET (gtk_builder_get_object (builder, "spin_ptr"));
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_ptr),
 		  battstat->red_val);
   g_signal_connect (G_OBJECT (spin_ptr), "value-changed",
@@ -337,7 +335,7 @@
   else
 	  gtk_combo_box_set_active (GTK_COMBO_BOX (combo_ptr), 0);
 
-  battstat->full_toggle = glade_xml_get_widget (glade_xml, "full_toggle");
+  battstat->full_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "full_toggle"));
   g_signal_connect (G_OBJECT (battstat->full_toggle), "toggled",
   		    G_CALLBACK (full_toggled), battstat);
 
@@ -357,8 +355,8 @@
 		    TRUE);
   }
 
-  battstat->radio_traditional_battery = glade_xml_get_widget (glade_xml,
-		  "battery_view_2");
+  battstat->radio_traditional_battery = GTK_WIDGET (gtk_builder_get_object (builder,
+		  "battery_view_2"));
   g_signal_connect (G_OBJECT (battstat->radio_traditional_battery), "toggled",
   		    G_CALLBACK (radio_traditional_toggled), battstat);
 
@@ -372,8 +370,8 @@
 		    TRUE);
   }
   
-  battstat->radio_ubuntu_battery = glade_xml_get_widget (glade_xml,
-		  "battery_view");
+  battstat->radio_ubuntu_battery = GTK_WIDGET (gtk_builder_get_object (builder,
+		  "battery_view"));
   g_signal_connect (G_OBJECT (battstat->radio_ubuntu_battery), "toggled",
   		    G_CALLBACK (radio_ubuntu_toggled), battstat);
 
@@ -386,11 +384,13 @@
 		    GTK_TOGGLE_BUTTON (battstat->radio_ubuntu_battery), TRUE);
   }
 
-  battstat->radio_text_1 = glade_xml_get_widget (glade_xml, "show_text_radio");
-  battstat->radio_text_2 = glade_xml_get_widget (glade_xml,
-		  "show_text_radio_2");
-  battstat->check_text = glade_xml_get_widget (glade_xml,
-		  "show_text_remaining");
+  battstat->radio_text_1 = GTK_WIDGET (gtk_builder_get_object (builder, "show_text_radio"));
+  battstat->radio_text_2 = GTK_WIDGET (gtk_builder_get_object (builder,
+		  "show_text_radio_2"));
+  battstat->check_text = GTK_WIDGET (gtk_builder_get_object (builder,
+		  "show_text_remaining"));
+
+  g_object_unref (builder);
   
   g_signal_connect (G_OBJECT (battstat->radio_text_1), "toggled",
 		  G_CALLBACK (show_text_toggled), battstat);
Index: configure.in
===================================================================
--- configure.in	(revision 10735)
+++ configure.in	(working copy)
@@ -11,7 +11,7 @@
 dnl ***************************************************************************
 dnl *** Minimum library versions for GNOME-APPLETS                          ***
 dnl ***************************************************************************
-GTK_REQUIRED=2.11.0
+GTK_REQUIRED=2.12.0
 GLIB_REQUIRED=2.13.0
 GIO_REQUIRED=2.15.3
 LIBGNOME_REQUIRED=2.8.0
@@ -21,7 +21,6 @@
 SCROLLKEEPER_REQUIRED=0.1.4
 LIBPANEL_REQUIRED=2.13.4
 LIBGTOP_REQUIRED=2.11.92
-LIBGLADE_REQUIRED=2.4.0
 LIBGAIL_REQUIRED=1.1.0
 LIBXKLAVIER_REQUIRED=2.91
 LIBWNCK_REQUIRED=2.9.3
@@ -145,11 +144,6 @@
 AC_SUBST(GNOME_VFS_APPLETS_LIBS)
 AM_CONDITIONAL(BUILD_GNOME_VFS_APPLETS, $build_gnome_vfs_applets)
 
-dnl -- check for libglade (required) ------------------------------------------
-PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
-AC_SUBST(LIBGLADE_CFLAGS)
-AC_SUBST(LIBGLADE_LIBS)
-
 dnl -- check for libgtop (optional) -------------------------------------------
 build_gtop_applets=false
 PKG_CHECK_MODULES(GTOP_APPLETS,
@@ -353,7 +347,7 @@
 GNOME_DOC_INIT
 
 dnl ***************************************************************************
-dnl *** gnome-keyboard-applet specific checks                                           ***
+dnl *** gnome-keyboard-applet specific checks                               ***
 dnl ***************************************************************************
 
 dnl -- check to enable flags with --enable-flags ------------------------------
@@ -529,12 +523,11 @@
 
 AC_PATH_PROG(SU_TOOL, su)
 AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
-AM_PATH_SYSTEM_TOOLS_BACKENDS($SYSTEM_TOOLS_BACKENDS_REQUIRED, P_MODEMLIGHTS=modemlights)
 
-if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
+if test "x$HAVE_LIBUTIL" = "xtrue"; then
   MODEMLIGHTS_LIBS=" -lutil"
   AC_SUBST(MODEMLIGHTS_LIBS)
-  AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
+  AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "/usr/share/system-tools-backends-2.0/scripts/", [System tools backends])
   AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
   BUILD_MODEM_LIGHTS=yes
 else
@@ -689,12 +682,12 @@
 AC_SUBST(pixmapsdir)
 pkgdatadir="${datadir}/gnome-applets"
 AC_SUBST(pkgdatadir)
-gladedir="${pkgdatadir}/glade"
-AC_SUBST(gladedir)
+builderdir="${pkgdatadir}/builder"
+AC_SUBST(builderdir)
 
 AC_DEFINE_DIR(GNOME_ICONDIR, "${iconsdir}", [Gnome Icon Directory])
 AC_DEFINE_DIR(GNOME_PIXMAPSDIR, "${pixmapsdir}", [Gnome Pixmaps Directory])
-AC_DEFINE_DIR(GNOME_GLADEDIR, "${gladedir}", [Glade Resources Directory])
+AC_DEFINE_DIR(GTK_BUILDERDIR, "${builderdir}", [GtkBuilder Resources Directory])
 AC_DEFINE_DIR(DATADIR, "${datadir}", [datadir])
 AC_DEFINE_DIR(SYSCONFDIR, "${sysconfdir}", [sysconfdir])
 AC_DEFINE_DIR(LIBDIR, "${libdir}", [libdir])
@@ -702,14 +695,14 @@
 
 AS_AC_EXPAND(DATADIR, "${datadir}")
 AS_AC_EXPAND(PYTHONDIR, $pythondir)
-AS_AC_EXPAND(GLADEDIR, $gladedir)
+AS_AC_EXPAND(BUILDERDIR, $builderdir)
 
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
 AC_SUBST(DATADIR)
 AC_SUBST(LIBDIR)
 AC_SUBST(PYTHONDIR)
-AC_SUBST(GLADEDIR)
+AC_SUBST(BUILDERDIR)
 
 dnl ***************************************************************************
 dnl *** Output Makefiles et al                                              ***
Index: invest-applet/invest/__init__.py
===================================================================
--- invest-applet/invest/__init__.py	(revision 10735)
+++ invest-applet/invest/__init__.py	(working copy)
@@ -23,7 +23,7 @@
 	GLADE_DATA_DIR = SHARED_DATA_DIR
 else:
 	SHARED_DATA_DIR = join(DATA_DIR, "gnome-applets", "invest-applet")
-	GLADE_DATA_DIR = GLADEDIR
+	BUILDER_DATA_DIR = BUILDERDIR
 print "Data Dir: %s" % SHARED_DATA_DIR
 
 USER_INVEST_DIR = expanduser("~/.gnome2/invest-applet")
Index: invest-applet/invest/invest-chart
===================================================================
--- invest-applet/invest/invest-chart	(revision 10735)
+++ invest-applet/invest/invest-chart	(working copy)
@@ -8,8 +8,6 @@
 gettext.textdomain(invest.defs.GETTEXT_PACKAGE)
 locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
 locale.textdomain(invest.defs.GETTEXT_PACKAGE)
-gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
-gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
 
 if __name__ == "__main__":
 	win = invest.chart.show_chart(sys.argv[1:])
Index: invest-applet/invest/quotes.py
===================================================================
--- invest-applet/invest/quotes.py	(revision 10735)
+++ invest-applet/invest/quotes.py	(working copy)
@@ -2,7 +2,7 @@
 from os.path import *
 import gnomeapplet, gtk, gtk.gdk, gconf, gobject
 from gettext import gettext as _
-import gtk, gtk.glade, gobject, gnomevfs
+import gtk, gobject, gnomevfs
 import csv, os
 
 import invest, invest.about, invest.chart
Index: invest-applet/invest/chart.py
===================================================================
--- invest-applet/invest/chart.py	(revision 10735)
+++ invest-applet/invest/chart.py	(working copy)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import gtk, gtk.gdk, gtk.glade
+import gtk, gtk.gdk
 import gobject
 import gnomevfs
 import os
@@ -50,23 +50,23 @@
 		self.ui = ui
 		
 		# Window Properties
-		win = ui.get_widget("window")
+		win = ui.get_object("window")
 		win.set_title(_("Financial Chart"))
 		
 		try:
 			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-16.png"), -1,-1)
 			win.set_icon(pixbuf)
 			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest.svg"), 96,96)
-			self.ui.get_widget("plot").set_from_pixbuf(pixbuf)
+			self.ui.get_object("plot").set_from_pixbuf(pixbuf)
 		except Exception, msg:
 			pass
 		
 		# Defaut comboboxes values
 		for widget in ["t", "q"]:
-			ui.get_widget(widget).set_active(0)
+			ui.get_object(widget).set_active(0)
 		
 		# Connect every option widget to its corresponding change signal	
-		symbolentry = ui.get_widget("s")
+		symbolentry = ui.get_object("s")
 		refresh_chart_callback = lambda w: self.on_refresh_chart()
 		
 		for widgets, signal in [
@@ -78,16 +78,16 @@
 			(("s",), "activate"),
 		]:
 			for widget in widgets:
-				ui.get_widget(widget).connect(signal, refresh_chart_callback)
+				ui.get_object(widget).connect(signal, refresh_chart_callback)
 		
-		ui.get_widget("progress").hide()
+		ui.get_object("progress").hide()
 		
 		# Connect auto-refresh widget
 		self.autorefresh_id = 0
-		ui.get_widget("autorefresh").connect("toggled", self.on_autorefresh_toggled)
+		ui.get_object("autorefresh").connect("toggled", self.on_autorefresh_toggled)
 										
 	def on_refresh_chart(self, from_timer=False):
-		tickers = self.ui.get_widget("s").get_text()
+		tickers = self.ui.get_object("s").get_text()
 			
 		if tickers.strip() == "":
 			return True
@@ -98,7 +98,7 @@
 		tickers = [ticker.strip().upper() for ticker in tickers.split(' ') if ticker != ""]
 		
 		# Update Window Title ------------------------------------------------------
-		win = self.ui.get_widget("window")
+		win = self.ui.get_object("window")
 		title = _("Financial Chart - %s")
 		titletail = ""
 		for ticker in tickers:
@@ -132,7 +132,7 @@
 			("ps", ""),
 			("pv", ""),
 		]:
-			if self.ui.get_widget(name).get_active():
+			if self.ui.get_object(name).get_active():
 				p += "%s%s," % (name[1], param)
 			
 		# Create the indicators string ---------------------------------------------
@@ -148,14 +148,14 @@
 			("av",  ""),
 			("avm", ""),
 		]:
-			if self.ui.get_widget(name).get_active():
+			if self.ui.get_object(name).get_active():
 				a += "%s%s," % (name[1:], param)
 		
 		# Create the image URL -----------------------------------------------------
 		url = CHART_BASE_URL % {
 			"s": tickers[0],
-			"t": self.ui.get_widget("t").get_active_text(),
-			"q": self.ui.get_widget("q").get_active_text(),
+			"t": self.ui.get_object("t").get_active_text(),
+			"q": self.ui.get_object("q").get_active_text(),
 			"l": "off",
 			"z": "l",
 			"p": p,
@@ -164,19 +164,19 @@
 		}
 		
 		# Download and display the image -------------------------------------------	
-		progress = self.ui.get_widget("progress")
+		progress = self.ui.get_object("progress")
 		progress.set_text(_("Opening Chart"))
 		progress.show()
 		
 		gnomevfs.async.open(url, lambda h,e: self.on_chart_open(h,e,url))
 
 		# Update timer if needed
-		self.on_autorefresh_toggled(self.ui.get_widget("autorefresh"))
+		self.on_autorefresh_toggled(self.ui.get_object("autorefresh"))
 				
 		return True
 	
 	def on_chart_open(self, handle, exc_type, url):
-		progress = self.ui.get_widget("progress")
+		progress = self.ui.get_object("progress")
 		progress.set_text(_("Downloading Chart"))
 		
 		if not exc_type:
@@ -188,7 +188,7 @@
 
 	def on_chart_read(self, handle, data, exc_type, bytes_requested, udata):
 		loader, url = udata
-		progress = self.ui.get_widget("progress")
+		progress = self.ui.get_object("progress")
 		progress.set_text(_("Reading Chart chunk"))
 		
 		if not exc_type:
@@ -197,7 +197,7 @@
 		if exc_type:
 			loader.close()
 			handle.close(lambda *args: None)
-			self.ui.get_widget("plot").set_from_pixbuf(loader.get_pixbuf())
+			self.ui.get_object("plot").set_from_pixbuf(loader.get_pixbuf())
 			progress.set_text(url)
 		else:
 			progress.set_text(_("Downloading Chart"))
@@ -212,9 +212,10 @@
 			self.autorefresh_id = gobject.timeout_add(AUTOREFRESH_TIMEOUT, self.on_refresh_chart, True)
 
 def show_chart(tickers):
-	ui = gtk.glade.XML(os.path.join(invest.GLADE_DATA_DIR, "financialchart.glade"))
+	ui = gtk.Builder();
+	ui.add_from_file(os.path.join(invest.BUILDER_DATA_DIR, "financialchart.ui"))
 	chart = FinancialChart(ui)
-	ui.get_widget("s").set_text(' '.join(tickers))
+	ui.get_object("s").set_text(' '.join(tickers))
 	chart.on_refresh_chart()
-	return ui.get_widget("window")
+	return ui.get_object("window")
 
Index: invest-applet/invest/preferences.py
===================================================================
--- invest-applet/invest/preferences.py	(revision 10735)
+++ invest-applet/invest/preferences.py	(working copy)
@@ -1,6 +1,6 @@
 from gettext import gettext as _
 from os.path import join
-import gtk, gtk.glade, gobject, gconf
+import gtk, gobject, gconf
 import invest
 from gettext import gettext as _
 
@@ -8,15 +8,16 @@
 
 class PrefsDialog:
 	def __init__(self, applet):
-		self.glade = gtk.glade.XML(join(invest.GLADE_DATA_DIR, "prefs-dialog.glade"))
+		self.ui = gtk.Builder()
+		self.ui.add_from_file(os.path.join(invest.BUILDER_DATA_DIR, "prefs-dialog.ui"))
 
-		self.dialog = self.glade.get_widget("preferences")
-		self.treeview = self.glade.get_widget("stocks")
+		self.dialog = self.ui.get_object("preferences")
+		self.treeview = self.ui.get_object("stocks")
 		
-		self.glade.get_widget("add").connect('clicked', self.on_add_stock)
-		self.glade.get_widget("add").connect('activate', self.on_add_stock)
-		self.glade.get_widget("remove").connect('clicked', self.on_remove_stock)
-		self.glade.get_widget("remove").connect('activate', self.on_remove_stock)
+		self.ui.get_object("add").connect('clicked', self.on_add_stock)
+		self.ui.get_object("add").connect('activate', self.on_add_stock)
+		self.ui.get_object("remove").connect('clicked', self.on_remove_stock)
+		self.ui.get_object("remove").connect('activate', self.on_remove_stock)
 		self.treeview.connect('key-press-event', self.on_tree_keypress)
 		
 		store = gtk.ListStore(str, int, float, float)
Index: invest-applet/invest/defs.py.in
===================================================================
--- invest-applet/invest/defs.py.in	(revision 10735)
+++ invest-applet/invest/defs.py.in	(working copy)
@@ -5,4 +5,4 @@
 PYTHONDIR = "@PYTHONDIR@"
 GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"
 GNOMELOCALEDIR = "@GNOMELOCALEDIR@"
-GLADEDIR = "@GLADEDIR@"
+BUILDERDIR = "@BUILDERDIR@"
Index: invest-applet/invest/widgets.py
===================================================================
--- invest-applet/invest/widgets.py	(revision 10735)
+++ invest-applet/invest/widgets.py	(working copy)
@@ -2,7 +2,7 @@
 from os.path import *
 import gnomeapplet, gtk, gtk.gdk, gconf, gobject, pango
 from gettext import gettext as _
-import gtk, gtk.glade, gobject, gnomevfs
+import gtk, gobject, gnomevfs
 import csv, os
 from gettext import gettext as _
 import invest, invest.about, invest.chart
Index: invest-applet/data/financialchart.ui
===================================================================
--- invest-applet/data/financialchart.ui	(revision 0)
+++ invest-applet/data/financialchart.ui	(revision 0)
@@ -0,0 +1,1018 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">1d</col>
+      </row>
+      <row>
+        <col id="0">5d</col>
+      </row>
+      <row>
+        <col id="0">3m</col>
+      </row>
+      <row>
+        <col id="0">6m</col>
+      </row>
+      <row>
+        <col id="0">1y</col>
+      </row>
+      <row>
+        <col id="0">3y</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">l</col>
+      </row>
+      <row>
+        <col id="0">b</col>
+      </row>
+      <row>
+        <col id="0">c</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="border_width">6</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Financial Chart</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">False</property>
+    <property name="default_height">500</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">stock_chart</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>
+    <property name="urgency_hint">False</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Ticker symbol: </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="mnemonic_widget">s</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>
+            <child>
+              <object class="GtkEntry" id="s">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="editable">True</property>
+                <property name="visibility">True</property>
+                <property name="max_length">0</property>
+                <property name="text" translatable="yes"/>
+                <property name="has_frame">True</property>
+                <property name="invisible_char">*</property>
+                <property name="activates_default">False</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="autorefresh">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <property name="active">True</property>
+                <property name="inconsistent">False</property>
+                <property name="draw_indicator">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="hbox5">
+                        <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-refresh</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="label8">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Auto _refresh</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>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="t">
+                <property name="visible">True</property>
+                <property name="add_tearoffs">False</property>
+                <property name="focus_on_click">True</property>
+                <property name="model">model1</property>
+                <child>
+                  <object class="GtkCellRendererText" id="renderer1"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                  </attributes>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkExpander" id="expander1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="expanded">False</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkTable" id="table1">
+                <property name="visible">True</property>
+                <property name="n_rows">5</property>
+                <property name="n_columns">2</property>
+                <property name="homogeneous">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Graph style: </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">1</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="mnemonic_widget">q</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="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">0</property>
+                    <property name="bottom_attach">1</property>
+                    <property name="x_options">fill</property>
+                    <property name="y_options"/>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Moving average: </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">1</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="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">fill</property>
+                    <property name="y_options"/>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Exponential moving average: </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">1</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="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">fill</property>
+                    <property name="y_options"/>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="q">
+                    <property name="visible">True</property>
+                    <property name="add_tearoffs">False</property>
+                    <property name="focus_on_click">True</property>
+                    <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>
+                    <property name="top_attach">0</property>
+                    <property name="bottom_attach">1</property>
+                    <property name="y_options">fill</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox3">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkCheckButton" id="pe5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pe10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">10</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pe20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">20</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pe50">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">50</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pe100">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">100</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pe200">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">200</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </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">fill</property>
+                    <property name="y_options">fill</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Overlays: </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">1</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="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options">fill</property>
+                    <property name="y_options"/>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox4">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">0</property>
+                    <child>
+                      <object class="GtkCheckButton" id="pb">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Bollinger</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pp">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">SAR</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="ps">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Splits</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pv">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Volumes</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </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">fill</property>
+                    <property name="y_options">fill</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Indicators: </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">1</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="left_attach">0</property>
+                    <property name="right_attach">1</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">fill</property>
+                    <property name="y_options"/>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTable" id="table2">
+                    <property name="visible">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">3</property>
+                    <property name="homogeneous">False</property>
+                    <property name="row_spacing">0</property>
+                    <property name="column_spacing">0</property>
+                    <child>
+                      <object class="GtkCheckButton" id="ar">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">RSI</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="av">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Vol</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="af">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">MFI</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="ass">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Slow stoch</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</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="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="avm">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Vol+MA</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </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">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="ap">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">ROC</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="afs">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Fast stoch</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </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">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="aw">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">W%R</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="am">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">MACD</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">fill</property>
+                    <property name="y_options">fill</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkCheckButton" id="pm5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pm10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">10</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pm20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">20</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">True</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pm50">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">50</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pm100">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">100</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pm200">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">200</property>
+                        <property name="use_underline">True</property>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
+                        <property name="active">False</property>
+                        <property name="inconsistent">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </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">fill</property>
+                    <property name="y_options">fill</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Options</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>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="shadow_type">GTK_SHADOW_IN</property>
+            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+            <child>
+              <object class="GtkViewport" id="plotport">
+                <property name="visible">True</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <object class="GtkImage" id="plot">
+                    <property name="visible">True</property>
+                    <property name="icon_size">5</property>
+                    <property name="icon_name">stock_chart</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="progress">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">Downloading chart from &lt;b&gt;Yahoo!&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">True</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>
+</interface>
Index: invest-applet/data/prefs-dialog.ui
===================================================================
--- invest-applet/data/prefs-dialog.ui	(revision 0)
+++ invest-applet/data/prefs-dialog.ui	(revision 0)
@@ -0,0 +1,227 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkDialog" id="preferences">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Invest Preferences</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">True</property>
+    <property name="default_height">450</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name"/>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <signal handler="prefs_dialog_response_cb" last_modification_time="Sat, 10 May 2003 09:37:44 GMT" name="response"/>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="close">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</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="big_box">
+            <property name="border_width">5</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkVBox" id="loaded_extensions_box">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label1310">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Stocks&lt;/b&gt;</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="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>
+                <child>
+                  <object class="GtkAlignment" id="alignment16">
+                    <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">18</property>
+                    <property name="right_padding">0</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox156">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="handlers">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="has_focus">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                            <child>
+                              <object class="GtkTreeView" id="stocks">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="headers_visible">True</property>
+                                <property name="rules_hint">True</property>
+                                <property name="reorderable">True</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>
+                        <child>
+                          <object class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkButton" id="add">
+                                <property name="visible">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>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="remove">
+                                <property name="visible">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>
+                              <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">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="default_info">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;i&gt;&lt;small&gt;&lt;b&gt;Note:&lt;/b&gt; Quotes are delayed at least 15 minutes.
+&lt;b&gt;Source: &lt;/b&gt; Yahoo!&lt;/small&gt;&lt;/i&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</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>
+                  <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>
+          <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="-7">close</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: invest-applet/data/Makefile.am
===================================================================
--- invest-applet/data/Makefile.am	(revision 10735)
+++ invest-applet/data/Makefile.am	(working copy)
@@ -23,9 +23,9 @@
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = \
 	Invest_Applet.xml
-glade_DATA = \
-	prefs-dialog.glade \
-	financialchart.glade
+builder_DATA = \
+	prefs-dialog.ui \
+	financialchart.ui
 
 investbindir = $(libdir)/invest-applet
 
@@ -53,4 +53,4 @@
 	Invest_Applet.server.in.in \
 	GNOME_GtikApplet.server \
 	$(ui_DATA) \
-	$(glade_DATA)
+	$(builder_DATA)
Index: mini-commander/src/preferences.c
===================================================================
--- mini-commander/src/preferences.c	(revision 10735)
+++ mini-commander/src/preferences.c	(working copy)
@@ -33,7 +33,6 @@
 #include <panel-applet-gconf.h>
 #include <libgnome/gnome-init.h>
 #include <libgnomeui/gnome-help.h>
-#include <glade/glade-xml.h>
 #include <gconf/gconf-client.h>
 
 #include "mini-commander_applet.h"
@@ -456,8 +455,8 @@
 }
 
 static void
-setup_add_dialog (GladeXML *xml,
-		  MCData   *mc)
+setup_add_dialog (GtkBuilder *builder,
+		  MCData     *mc)
 {
     MCPrefsDialog *dialog;
 
@@ -466,8 +465,8 @@
     g_signal_connect (dialog->macro_add_dialog, "response",
 		      G_CALLBACK (add_response), mc);
 
-    dialog->pattern_entry = glade_xml_get_widget (xml, "pattern_entry");
-    dialog->command_entry = glade_xml_get_widget (xml, "command_entry");
+    dialog->pattern_entry = GTK_WIDGET (gtk_builder_get_object (builder, "pattern_entry"));
+    dialog->command_entry = GTK_WIDGET (gtk_builder_get_object (builder, "command_entry"));
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog->macro_add_dialog), GTK_RESPONSE_OK);
 }
@@ -477,17 +476,19 @@
            MCData    *mc)
 {
     if (!mc->prefs_dialog.macro_add_dialog) {
-	GladeXML *xml;
+	GtkBuilder *builder;
 
-	xml = glade_xml_new (GNOME_GLADEDIR "/mini-commander.glade", "mc_macro_add_dialog", NULL);
-	mc->prefs_dialog.macro_add_dialog = glade_xml_get_widget (xml, "mc_macro_add_dialog");
+	builder = gtk_builder_new ();
+	gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/mini-commander.ui", NULL);
 
+	mc->prefs_dialog.macro_add_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "mc_macro_add_dialog"));
+
 	g_object_add_weak_pointer (G_OBJECT (mc->prefs_dialog.macro_add_dialog),
 				   (gpointer *) &mc->prefs_dialog.macro_add_dialog);
 
-	setup_add_dialog (xml, mc);
+	setup_add_dialog (builder, mc);
 
-	g_object_unref (xml);
+	g_object_unref (builder);
     }
 
     gtk_window_set_screen (GTK_WINDOW (mc->prefs_dialog.macro_add_dialog),
@@ -663,8 +664,8 @@
 }
 
 static void
-mc_preferences_setup_dialog (GladeXML *xml,
-			     MCData   *mc)
+mc_preferences_setup_dialog (GtkBuilder *builder,
+			     MCData     *mc)
 {
     MCPrefsDialog   *dialog;
     GtkCellRenderer *renderer;
@@ -679,14 +680,14 @@
     gtk_dialog_set_default_response (GTK_DIALOG (dialog->dialog), GTK_RESPONSE_CLOSE);
     gtk_window_set_default_size (GTK_WINDOW (dialog->dialog), 400, -1);
 
-    dialog->auto_complete_history_toggle = glade_xml_get_widget (xml, "auto_complete_history_toggle");
-    dialog->size_spinner                 = glade_xml_get_widget (xml, "size_spinner");
-    dialog->use_default_theme_toggle     = glade_xml_get_widget (xml, "default_theme_toggle");
-    dialog->fg_color_picker              = glade_xml_get_widget (xml, "fg_color_picker");
-    dialog->bg_color_picker              = glade_xml_get_widget (xml, "bg_color_picker");
-    dialog->macros_tree                  = glade_xml_get_widget (xml, "macros_tree");
-    dialog->delete_button                = glade_xml_get_widget (xml, "delete_button");
-    dialog->add_button                   = glade_xml_get_widget (xml, "add_button");
+    dialog->auto_complete_history_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "auto_complete_history_toggle"));
+    dialog->size_spinner                 = GTK_WIDGET (gtk_builder_get_object (builder, "size_spinner"));
+    dialog->use_default_theme_toggle     = GTK_WIDGET (gtk_builder_get_object (builder, "default_theme_toggle"));
+    dialog->fg_color_picker              = GTK_WIDGET (gtk_builder_get_object (builder, "fg_color_picker"));
+    dialog->bg_color_picker              = GTK_WIDGET (gtk_builder_get_object (builder, "bg_color_picker"));
+    dialog->macros_tree                  = GTK_WIDGET (gtk_builder_get_object (builder, "macros_tree"));
+    dialog->delete_button                = GTK_WIDGET (gtk_builder_get_object (builder, "delete_button"));
+    dialog->add_button                   = GTK_WIDGET (gtk_builder_get_object (builder, "add_button"));
 
     /* History based autocompletion */
     g_signal_connect (dialog->auto_complete_history_toggle, "toggled",
@@ -702,8 +703,8 @@
 		      G_CALLBACK (size_value_changed), mc); 
     if ( ! mc_key_writable (mc, "normal_size_x")) {
 	    hard_set_sensitive (dialog->size_spinner, FALSE);
-	    hard_set_sensitive (glade_xml_get_widget (xml, "size_label"), FALSE);
-	    hard_set_sensitive (glade_xml_get_widget (xml, "size_post_label"), FALSE);
+	    hard_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "size_label")), FALSE);
+	    hard_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "size_post_label")), FALSE);
     }
 
     /* Use default theme */
@@ -727,7 +728,7 @@
 	 ! mc_key_writable (mc, "cmd_line_color_fg_g") ||
 	 ! mc_key_writable (mc, "cmd_line_color_fg_b")) {
 	    hard_set_sensitive (dialog->fg_color_picker, FALSE);
-	    hard_set_sensitive (glade_xml_get_widget (xml, "fg_color_label"), FALSE);
+	    hard_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "fg_color_label")), FALSE);
     }
 
     /* Background color */
@@ -743,7 +744,7 @@
 	 ! mc_key_writable (mc, "cmd_line_color_bg_g") ||
 	 ! mc_key_writable (mc, "cmd_line_color_bg_b")) {
 	    hard_set_sensitive (dialog->bg_color_picker, FALSE);
-	    hard_set_sensitive (glade_xml_get_widget (xml, "bg_color_label"), FALSE);
+	    hard_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "bg_color_label")), FALSE);
     }
 
 
@@ -795,19 +796,20 @@
 		     const char        *verbname)
 {
     if (!mc->prefs_dialog.dialog) {
-	GladeXML *xml;
+	GtkBuilder *builder;
 
-	xml = glade_xml_new (GNOME_GLADEDIR "/mini-commander.glade",
-			"mc_preferences_dialog", NULL);
-	mc->prefs_dialog.dialog = glade_xml_get_widget (xml,
-			"mc_preferences_dialog");
+	builder = gtk_builder_new ();
+	gtk_builder_add_from_file (builder, GTK_BUILDERDIR "/mini-commander.ui", NULL);
 
+	mc->prefs_dialog.dialog = GTK_WIDGET (gtk_builder_get_object (builder,
+			"mc_preferences_dialog"));
+
 	g_object_add_weak_pointer (G_OBJECT (mc->prefs_dialog.dialog),
 				   (gpointer *) &mc->prefs_dialog.dialog);
 
-	mc_preferences_setup_dialog (xml, mc);
+	mc_preferences_setup_dialog (builder, mc);
 
-	g_object_unref (xml);
+	g_object_unref (builder);
     }
 
     gtk_window_set_screen (GTK_WINDOW (mc->prefs_dialog.dialog),
Index: mini-commander/src/GNOME_MiniCommanderApplet.server
===================================================================
--- mini-commander/src/GNOME_MiniCommanderApplet.server	(revision 10735)
+++ mini-commander/src/GNOME_MiniCommanderApplet.server	(working copy)
@@ -2,30 +2,196 @@
 
 <oaf_server iid="OAFIID:GNOME_MiniCommanderApplet_Factory"
 	    type="exe"
-	    location="mini_commander_applet">
+	    location="/opt/gnome2/libexec/mini_commander_applet">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="name" type="string" value="MiniCommander Applet Factory"/>
-	<oaf_attribute name="name-da" type="string" value="Fabrik for kommandobropanelprogram"/>
-	<oaf_attribute name="name-ja" type="string" value="ミニコマンダー・アプレット ファクトリ"/>
+	<oaf_attribute name="name-ar" type="string" value="مصنع بريمج الآمر الصغير"/>
+	<oaf_attribute name="name-as" type="string" value="MiniCommander এপ্লেট কলঘৰ"/>
+	<oaf_attribute name="name-az" type="string" value="Kiçik-Əmr Appleti E&apos;malatxanası"/>
+	<oaf_attribute name="name-be" type="string" value="Вытворчасьць аплета MiniCommander"/>
+	<oaf_attribute name="name-be@latin" type="string" value="Hieneratar apletu MiniCommandera"/>
+	<oaf_attribute name="name-bg" type="string" value="Фабрика на аплета „Мини-командир“"/>
+	<oaf_attribute name="name-bn" type="string" value="MiniCommander অ্যাপ্লেট ফ্যাক্টরি"/>
+	<oaf_attribute name="name-bn_IN" type="string" value="MiniCommander অ্যাপ্লেট ফ্যাক্টরি"/>
+	<oaf_attribute name="name-bs" type="string" value="Tvornica apleta minicommander"/>
+	<oaf_attribute name="name-ca" type="string" value="Fàbrica de la miniaplicació MiniCommander"/>
+	<oaf_attribute name="name-cs" type="string" value="Generátor appletu Mini-Commander"/>
+	<oaf_attribute name="name-cy" type="string" value="Ffatri Rhaglenigion Gorchymynydd Pitw"/>
+	<oaf_attribute name="name-da" type="string" value="Fabrik for Mini-kommandolinje-panelprogram"/>
+	<oaf_attribute name="name-de" type="string" value="MiniCommander-Applet-Fabrik"/>
+	<oaf_attribute name="name-dz" type="string" value="གཙོ་དཔོན་ཆུང་བའི་ ཨེཔ་ལེཊི་འཕྲུལ་ཁང་།"/>
+	<oaf_attribute name="name-el" type="string" value="Εργοστάσιο μικροεφαρμογής Μίνι Διοικητή"/>
+	<oaf_attribute name="name-en_CA" type="string" value="MiniCommander Applet Factory"/>
+	<oaf_attribute name="name-en_GB" type="string" value="MiniCommander Applet Factory"/>
+	<oaf_attribute name="name-es" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_AR" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_CL" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_CO" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_CR" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_DO" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_EC" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_ES" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_GT" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_HN" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_MX" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_NI" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_PA" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_PE" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_PR" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_SV" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_UY" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-es_VE" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-et" type="string" value="MiniCommander Applet Factory"/>
+	<oaf_attribute name="name-eu" type="string" value="MiniCommander applet-aren fabrika"/>
+	<oaf_attribute name="name-fa" type="string" value="کارخانه‌ی برنامک MiniCommander"/>
+	<oaf_attribute name="name-fi" type="string" value="Pienoiskomentotulkkisovelman tehdas"/>
+	<oaf_attribute name="name-fr" type="string" value="Fabrique pour l&apos;applet MiniCommander"/>
+	<oaf_attribute name="name-gl" type="string" value="Factoría da miniaplicación Mini-Commander"/>
+	<oaf_attribute name="name-gu" type="string" value="નાનું આદેશકની એપ્લેટ કારખાનું"/>
+	<oaf_attribute name="name-he" type="string" value="יצרן יישומון שורת פקודה קטנה"/>
+	<oaf_attribute name="name-hi" type="string" value="मिनी-कमांडर अप्लेट फैक्टरी"/>
+	<oaf_attribute name="name-hr" type="string" value="Tvornica za MiniCommander"/>
+	<oaf_attribute name="name-hu" type="string" value="Parancssor kisalkalmazás factory"/>
+	<oaf_attribute name="name-hy" type="string" value="Մինի հրամանի ապլետ ֆաբրիկա"/>
+	<oaf_attribute name="name-id" type="string" value="Pabrikan Applet Tukang Perintah Mini"/>
+	<oaf_attribute name="name-it" type="string" value="Fabbrica Applet Mini commander"/>
+	<oaf_attribute name="name-ja" type="string" value="ミニ・コマンダー・アプレットのファクトリ"/>
+	<oaf_attribute name="name-ka" type="string" value="აპლეტის ფაბრიკა &quot;ბრძანებათა ხაზი&quot;"/>
+	<oaf_attribute name="name-ko" type="string" value="작은 명령 실행 애플릿 팩토리"/>
+	<oaf_attribute name="name-ku" type="string" value="Hilberînerê Sepanoka Serdarê Biçûk"/>
+	<oaf_attribute name="name-lt" type="string" value="MiniCommander įtaiso gamykla"/>
+	<oaf_attribute name="name-lv" type="string" value="MiniCommander apleta ražotne"/>
+	<oaf_attribute name="name-mg" type="string" value="Toerana fanamboarana ny Mini-Commander"/>
+	<oaf_attribute name="name-mk" type="string" value="Фабрика за Мини-уредувач аплетот"/>
+	<oaf_attribute name="name-ml" type="string" value="മിനികമാന്‍ഡര്‍ ആപ്-ലേറ്റ് ശാല"/>
+	<oaf_attribute name="name-mn" type="string" value="Мини-Коммандер апплетийг үүсгүүр"/>
+	<oaf_attribute name="name-mr" type="string" value="मिनी-कमांडर एप्लेट फॅक्टरी"/>
 	<oaf_attribute name="name-ms" type="string" value="Kilang Aplet MiniCommander"/>
-	<oaf_attribute name="name-no" type="string" value="Factory for mini-kommander-applet"/>
+	<oaf_attribute name="name-nb" type="string" value="Factory for mini-kommander-applet"/>
+	<oaf_attribute name="name-ne" type="string" value="सानो आदेश कर्ता एप्लेट कारखाना"/>
+	<oaf_attribute name="name-nl" type="string" value="MiniCommander Applet Fabriek"/>
+	<oaf_attribute name="name-nn" type="string" value="Fabrikk for kommandolinjepanelprogrammet"/>
+	<oaf_attribute name="name-oc" type="string" value="Fabrica per l&apos;aplet MiniCommander"/>
+	<oaf_attribute name="name-or" type="string" value="ମିନି-କମାଣ୍ଡର ଆପଲେଟ୍ କାରଖାନା"/>
+	<oaf_attribute name="name-pa" type="string" value="ਮਿੰਨੀ-ਕਮਾਂਡਰ ਐਪਲਿਟ ਫੈਕਟਰੀ"/>
 	<oaf_attribute name="name-pl" type="string" value="Generator apletu MiniCommandera"/>
-	<oaf_attribute name="name-sk" type="string" value="Vytváracie rozhranie pre applet Mini-Commander"/>
+	<oaf_attribute name="name-pt" type="string" value="Fábrica da Applet MiniCommander"/>
+	<oaf_attribute name="name-pt_BR" type="string" value="Fábrica do Miniaplicativo de Comandos"/>
+	<oaf_attribute name="name-ro" type="string" value="Factory aplet MiniCommander"/>
+	<oaf_attribute name="name-ru" type="string" value="Фабрика апплета &quot;Командная строка&quot;"/>
+	<oaf_attribute name="name-sk" type="string" value="Vytváracie rozhranie pre aplet Mini-Commander"/>
+	<oaf_attribute name="name-sl" type="string" value="Tovarna vstavka Mini-upravnik"/>
+	<oaf_attribute name="name-sq" type="string" value="Fabrika e Applet MiniKomandues"/>
+	<oaf_attribute name="name-sr" type="string" value="Производња програмчета за Малог-наредника"/>
+	<oaf_attribute name="name-sr@Latn" type="string" value="Proizvodnja programčeta za Malog-narednika"/>
 	<oaf_attribute name="name-sv" type="string" value="Fabrik för panelprogrammet MiniCommander"/>
-	<oaf_attribute name="name-zh_TW" type="string" value="小型命令窗面板程式工廠"/>
+	<oaf_attribute name="name-ta" type="string" value="குறுங்கட்டளையாளர் குறும்பயனகம்"/>
+	<oaf_attribute name="name-te" type="string" value="చిరు ఆదేశక ఆప్లెట్ కర్మాగారము"/>
+	<oaf_attribute name="name-th" type="string" value="โรงงานแอพเพล็ตบรรทัดคำสั่ง"/>
+	<oaf_attribute name="name-tr" type="string" value="Küçük Komutan Ugulamacık Üreticisi"/>
+	<oaf_attribute name="name-uk" type="string" value="Фабрика аплету командного рядка"/>
+	<oaf_attribute name="name-vi" type="string" value="Bộ tạo tiểu dụng Bộ lệnh tí ti"/>
+	<oaf_attribute name="name-wa" type="string" value="Aplikete Mini Roye di Comande"/>
+	<oaf_attribute name="name-xh" type="string" value="Ifektri yenkqutyana yekhompyutha yoMyalelo omNcinci"/>
+	<oaf_attribute name="name-zh_CN" type="string" value="小型命令行小程序工厂"/>
+	<oaf_attribute name="name-zh_HK" type="string" value="小型命令列面板程式工廠"/>
+	<oaf_attribute name="name-zh_TW" type="string" value="小型命令列面板程式工廠"/>
 	<oaf_attribute name="description" type="string" value="MiniCommander Applet Factory"/>
-	<oaf_attribute name="description-da" type="string" value="Fabrik for kommandobropanelprogram"/>
-	<oaf_attribute name="description-ja" type="string" value="ミニコマンダー・アプレット ファクトリ"/>
+	<oaf_attribute name="description-ar" type="string" value="مصنع بريمج الآمر الصغير"/>
+	<oaf_attribute name="description-as" type="string" value="MiniCommander এপ্লেট কলঘৰ"/>
+	<oaf_attribute name="description-az" type="string" value="Kiçik-Əmr Appleti E&apos;malatxanası"/>
+	<oaf_attribute name="description-be" type="string" value="Вытворчасьць аплета MiniCommander"/>
+	<oaf_attribute name="description-be@latin" type="string" value="Hieneratar apletu MiniCommandera"/>
+	<oaf_attribute name="description-bg" type="string" value="Фабрика на аплета „Мини-командир“"/>
+	<oaf_attribute name="description-bn" type="string" value="MiniCommander অ্যাপ্লেট ফ্যাক্টরি"/>
+	<oaf_attribute name="description-bn_IN" type="string" value="MiniCommander অ্যাপ্লেট ফ্যাক্টরি"/>
+	<oaf_attribute name="description-bs" type="string" value="Tvornica apleta minicommander"/>
+	<oaf_attribute name="description-ca" type="string" value="Fàbrica de la miniaplicació MiniCommander"/>
+	<oaf_attribute name="description-cs" type="string" value="Generátor appletu Mini-Commander"/>
+	<oaf_attribute name="description-cy" type="string" value="Ffatri Rhaglenigion Gorchymynydd Pitw"/>
+	<oaf_attribute name="description-da" type="string" value="Fabrik for Mini-kommandolinje-panelprogram"/>
+	<oaf_attribute name="description-de" type="string" value="MiniCommander-Applet-Fabrik"/>
+	<oaf_attribute name="description-dz" type="string" value="གཙོ་དཔོན་ཆུང་བའི་ ཨེཔ་ལེཊི་འཕྲུལ་ཁང་།"/>
+	<oaf_attribute name="description-el" type="string" value="Εργοστάσιο μικροεφαρμογής Μίνι Διοικητή"/>
+	<oaf_attribute name="description-en_CA" type="string" value="MiniCommander Applet Factory"/>
+	<oaf_attribute name="description-en_GB" type="string" value="MiniCommander Applet Factory"/>
+	<oaf_attribute name="description-es" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_AR" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_CL" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_CO" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_CR" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_DO" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_EC" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_ES" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_GT" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_HN" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_MX" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_NI" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_PA" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_PE" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_PR" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_SV" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_UY" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-es_VE" type="string" value="Fábrica de la miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-et" type="string" value="MiniCommander Applet Factory"/>
+	<oaf_attribute name="description-eu" type="string" value="MiniCommander applet-aren fabrika"/>
+	<oaf_attribute name="description-fa" type="string" value="کارخانه‌ی برنامک MiniCommander"/>
+	<oaf_attribute name="description-fi" type="string" value="Pienoiskomentotulkkisovelman tehdas"/>
+	<oaf_attribute name="description-fr" type="string" value="Fabrique pour l&apos;applet MiniCommander"/>
+	<oaf_attribute name="description-gl" type="string" value="Factoría da miniaplicación Mini-Commander"/>
+	<oaf_attribute name="description-gu" type="string" value="નાનું આદેશકની એપ્લેટ કારખાનું"/>
+	<oaf_attribute name="description-he" type="string" value="יצרן יישומון שורת פקודה קטנה"/>
+	<oaf_attribute name="description-hi" type="string" value="मिनी-कमांडर अप्लेट फैक्टरी"/>
+	<oaf_attribute name="description-hr" type="string" value="Tvornica za MiniCommander"/>
+	<oaf_attribute name="description-hu" type="string" value="Parancssor kisalkalmazás factory"/>
+	<oaf_attribute name="description-hy" type="string" value="Մինի հրամանի ապլետ ֆաբրիկա"/>
+	<oaf_attribute name="description-id" type="string" value="Pabrikan Applet Tukang Perintah Mini"/>
+	<oaf_attribute name="description-it" type="string" value="Fabbrica Applet Mini commander"/>
+	<oaf_attribute name="description-ja" type="string" value="ミニ・コマンダー・アプレットのファクトリ"/>
+	<oaf_attribute name="description-ka" type="string" value="აპლეტის ფაბრიკა &quot;ბრძანებათა ხაზი&quot;"/>
+	<oaf_attribute name="description-ko" type="string" value="작은 명령 실행 애플릿 팩토리"/>
+	<oaf_attribute name="description-ku" type="string" value="Hilberînerê Sepanoka Serdarê Biçûk"/>
+	<oaf_attribute name="description-lt" type="string" value="MiniCommander įtaiso gamykla"/>
+	<oaf_attribute name="description-lv" type="string" value="MiniCommander apleta ražotne"/>
+	<oaf_attribute name="description-mg" type="string" value="Toerana fanamboarana ny Mini-Commander"/>
+	<oaf_attribute name="description-mk" type="string" value="Фабрика за Мини-уредувач аплетот"/>
+	<oaf_attribute name="description-ml" type="string" value="മിനികമാന്‍ഡര്‍ ആപ്-ലേറ്റ് ശാല"/>
+	<oaf_attribute name="description-mn" type="string" value="Мини-Коммандер апплетийг үүсгүүр"/>
+	<oaf_attribute name="description-mr" type="string" value="मिनी-कमांडर एप्लेट फॅक्टरी"/>
 	<oaf_attribute name="description-ms" type="string" value="Kilang Aplet MiniCommander"/>
-	<oaf_attribute name="description-no" type="string" value="Factory for mini-kommander-applet"/>
+	<oaf_attribute name="description-nb" type="string" value="Factory for mini-kommander-applet"/>
+	<oaf_attribute name="description-ne" type="string" value="सानो आदेश कर्ता एप्लेट कारखाना"/>
+	<oaf_attribute name="description-nl" type="string" value="MiniCommander Applet Fabriek"/>
+	<oaf_attribute name="description-nn" type="string" value="Fabrikk for kommandolinjepanelprogrammet"/>
+	<oaf_attribute name="description-oc" type="string" value="Fabrica per l&apos;aplet MiniCommander"/>
+	<oaf_attribute name="description-or" type="string" value="ମିନି-କମାଣ୍ଡର ଆପଲେଟ୍ କାରଖାନା"/>
+	<oaf_attribute name="description-pa" type="string" value="ਮਿੰਨੀ-ਕਮਾਂਡਰ ਐਪਲਿਟ ਫੈਕਟਰੀ"/>
 	<oaf_attribute name="description-pl" type="string" value="Generator apletu MiniCommandera"/>
-	<oaf_attribute name="description-sk" type="string" value="Vytváracie rozhranie pre applet Mini-Commander"/>
+	<oaf_attribute name="description-pt" type="string" value="Fábrica da Applet MiniCommander"/>
+	<oaf_attribute name="description-pt_BR" type="string" value="Fábrica do Miniaplicativo de Comandos"/>
+	<oaf_attribute name="description-ro" type="string" value="Factory aplet MiniCommander"/>
+	<oaf_attribute name="description-ru" type="string" value="Фабрика апплета &quot;Командная строка&quot;"/>
+	<oaf_attribute name="description-sk" type="string" value="Vytváracie rozhranie pre aplet Mini-Commander"/>
+	<oaf_attribute name="description-sl" type="string" value="Tovarna vstavka Mini-upravnik"/>
+	<oaf_attribute name="description-sq" type="string" value="Fabrika e Applet MiniKomandues"/>
+	<oaf_attribute name="description-sr" type="string" value="Производња програмчета за Малог-наредника"/>
+	<oaf_attribute name="description-sr@Latn" type="string" value="Proizvodnja programčeta za Malog-narednika"/>
 	<oaf_attribute name="description-sv" type="string" value="Fabrik för panelprogrammet MiniCommander"/>
-	<oaf_attribute name="description-zh_TW" type="string" value="小型命令窗面板程式工廠"/>
+	<oaf_attribute name="description-ta" type="string" value="குறுங்கட்டளையாளர் குறும்பயனகம்"/>
+	<oaf_attribute name="description-te" type="string" value="చిరు ఆదేశక ఆప్లెట్ కర్మాగారము"/>
+	<oaf_attribute name="description-th" type="string" value="โรงงานแอพเพล็ตบรรทัดคำสั่ง"/>
+	<oaf_attribute name="description-tr" type="string" value="Küçük Komutan Ugulamacık Üreticisi"/>
+	<oaf_attribute name="description-uk" type="string" value="Фабрика аплету командного рядка"/>
+	<oaf_attribute name="description-vi" type="string" value="Bộ tạo tiểu dụng Bộ lệnh tí ti"/>
+	<oaf_attribute name="description-wa" type="string" value="Aplikete Mini Roye di Comande"/>
+	<oaf_attribute name="description-xh" type="string" value="Ifektri yenkqutyana yekhompyutha yoMyalelo omNcinci"/>
+	<oaf_attribute name="description-zh_CN" type="string" value="小型命令行小程序工厂"/>
+	<oaf_attribute name="description-zh_HK" type="string" value="小型命令列面板程式工廠"/>
+	<oaf_attribute name="description-zh_TW" type="string" value="小型命令列面板程式工廠"/>
 
 </oaf_server>
 
@@ -39,50 +205,198 @@
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
 	<oaf_attribute name="name" type="string" value="Command Line"/>
+	<oaf_attribute name="name-ar" type="string" value="سطر أوامر"/>
+	<oaf_attribute name="name-as" type="string" value="কমান্ড-লাইন"/>
+	<oaf_attribute name="name-az" type="string" value="Əmr Sətiri"/>
+	<oaf_attribute name="name-be" type="string" value="Загадны радок"/>
+	<oaf_attribute name="name-be@latin" type="string" value="Zahadny radok"/>
+	<oaf_attribute name="name-bg" type="string" value="Команден ред"/>
+	<oaf_attribute name="name-bn" type="string" value="কমান্ড-লাইন"/>
+	<oaf_attribute name="name-bn_IN" type="string" value="কমান্ড-লাইন"/>
+	<oaf_attribute name="name-bs" type="string" value="Komandna linija"/>
+	<oaf_attribute name="name-ca" type="string" value="Línia d&apos;ordres"/>
+	<oaf_attribute name="name-cs" type="string" value="Příkazový řádek"/>
+	<oaf_attribute name="name-cy" type="string" value="Llinell Orchymyn"/>
 	<oaf_attribute name="name-da" type="string" value="Kommandolinje"/>
-	<oaf_attribute name="name-it" type="string" value="Linea di comando"/>
+	<oaf_attribute name="name-de" type="string" value="Befehlszeile"/>
+	<oaf_attribute name="name-dz" type="string" value="བཀོད་ལམ།"/>
+	<oaf_attribute name="name-el" type="string" value="Γραμμή Εντολών"/>
+	<oaf_attribute name="name-en_CA" type="string" value="Command Line"/>
+	<oaf_attribute name="name-en_GB" type="string" value="Command Line"/>
+	<oaf_attribute name="name-es" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_AR" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_CL" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_CO" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_CR" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_DO" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_EC" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_ES" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_GT" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_HN" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_MX" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_NI" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_PA" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_PE" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_PR" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_SV" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_UY" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-es_VE" type="string" value="Línea de comandos"/>
+	<oaf_attribute name="name-et" type="string" value="Käsurida"/>
+	<oaf_attribute name="name-eu" type="string" value="Komando-lerroa"/>
+	<oaf_attribute name="name-fa" type="string" value="سطر فرمان"/>
+	<oaf_attribute name="name-fi" type="string" value="Komentorivi"/>
+	<oaf_attribute name="name-fr" type="string" value="Ligne de commande"/>
+	<oaf_attribute name="name-ga" type="string" value="Líne na n-Orduithe"/>
+	<oaf_attribute name="name-gl" type="string" value="Liña de comandos"/>
+	<oaf_attribute name="name-gu" type="string" value="આદેશ વાક્ય"/>
+	<oaf_attribute name="name-he" type="string" value="שורת פקודה"/>
+	<oaf_attribute name="name-hi" type="string" value="कमांड लाइन"/>
+	<oaf_attribute name="name-hr" type="string" value="Naredbena linija"/>
+	<oaf_attribute name="name-hu" type="string" value="Parancssor"/>
+	<oaf_attribute name="name-hy" type="string" value="Հրամանի տող"/>
+	<oaf_attribute name="name-id" type="string" value="Baris Perintah"/>
+	<oaf_attribute name="name-it" type="string" value="Riga di comando"/>
 	<oaf_attribute name="name-ja" type="string" value="コマンドライン"/>
+	<oaf_attribute name="name-ka" type="string" value="ბრძანებათა ხაზი"/>
+	<oaf_attribute name="name-kn" type="string" value="ಆಜ್ಞಾ ಸಾಲು"/>
+	<oaf_attribute name="name-ko" type="string" value="명령 행"/>
+	<oaf_attribute name="name-ku" type="string" value="Rêzika Fermanê"/>
+	<oaf_attribute name="name-lt" type="string" value="Komandinė eilutė"/>
+	<oaf_attribute name="name-lv" type="string" value="Komandrinda"/>
+	<oaf_attribute name="name-mg" type="string" value="Lazam-baiko"/>
+	<oaf_attribute name="name-mk" type="string" value="Командна линија"/>
+	<oaf_attribute name="name-ml" type="string" value="കമാന്‍ഡ് ലൈന്‍"/>
+	<oaf_attribute name="name-mn" type="string" value="Тушаалын мөр"/>
+	<oaf_attribute name="name-mr" type="string" value="आदेश पंक्ती"/>
 	<oaf_attribute name="name-ms" type="string" value="Arahan Baris"/>
-	<oaf_attribute name="name-no" type="string" value="Kommandolinje"/>
+	<oaf_attribute name="name-nb" type="string" value="Kommandolinje"/>
+	<oaf_attribute name="name-ne" type="string" value="आदेश रेखा"/>
+	<oaf_attribute name="name-nl" type="string" value="Opdrachtregel"/>
+	<oaf_attribute name="name-nn" type="string" value="Kommandolinje"/>
+	<oaf_attribute name="name-oc" type="string" value="Linha de comanda"/>
+	<oaf_attribute name="name-or" type="string" value="ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ"/>
+	<oaf_attribute name="name-pa" type="string" value="ਕਮਾਂਡ ਲਾਈਨ"/>
 	<oaf_attribute name="name-pl" type="string" value="Wiersz poleceń"/>
+	<oaf_attribute name="name-pt" type="string" value="Linha de Comando"/>
+	<oaf_attribute name="name-pt_BR" type="string" value="Linha de Comando"/>
+	<oaf_attribute name="name-ro" type="string" value="Comandă"/>
+	<oaf_attribute name="name-ru" type="string" value="Командная строка"/>
+	<oaf_attribute name="name-si" type="string" value="රේඛිය විධාන"/>
 	<oaf_attribute name="name-sk" type="string" value="Príkazový riadok"/>
+	<oaf_attribute name="name-sl" type="string" value="Ukazna vrstica"/>
+	<oaf_attribute name="name-sq" type="string" value="Rreshti i komandës"/>
+	<oaf_attribute name="name-sr" type="string" value="Наредба"/>
+	<oaf_attribute name="name-sr@Latn" type="string" value="Naredba"/>
 	<oaf_attribute name="name-sv" type="string" value="Kommandorad"/>
-	<oaf_attribute name="name-zh_TW" type="string" value="指令列"/>
+	<oaf_attribute name="name-ta" type="string" value="கட்டளை வரி"/>
+	<oaf_attribute name="name-te" type="string" value="ఆదేశ పంక్తి"/>
+	<oaf_attribute name="name-th" type="string" value="บรรทัดคำสั่ง"/>
+	<oaf_attribute name="name-tr" type="string" value="Komut Satırı"/>
+	<oaf_attribute name="name-uk" type="string" value="Командний рядок"/>
+	<oaf_attribute name="name-vi" type="string" value="Dòng lệnh"/>
+	<oaf_attribute name="name-wa" type="string" value="Roye di comande"/>
+	<oaf_attribute name="name-xh" type="string" value="Umgca woMyalelo"/>
+	<oaf_attribute name="name-zh_CN" type="string" value="命令行"/>
+	<oaf_attribute name="name-zh_HK" type="string" value="命令列"/>
+	<oaf_attribute name="name-zh_TW" type="string" value="命令列"/>
 	<oaf_attribute name="description" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-ar" type="string" value="آمر صغير"/>
+	<oaf_attribute name="description-as" type="string" value="Mini-Commander"/>
 	<oaf_attribute name="description-az" type="string" value="Kiçik Əmr Verici"/>
-	<oaf_attribute name="description-da" type="string" value="Kommandobro"/>
+	<oaf_attribute name="description-be" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-be@latin" type="string" value="Zahadny mini-radok"/>
+	<oaf_attribute name="description-bg" type="string" value="Мини-командир"/>
+	<oaf_attribute name="description-bn" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-bn_IN" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-bs" type="string" value="Mini-commander"/>
+	<oaf_attribute name="description-ca" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-cs" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-cy" type="string" value="Gorchmynydd Pitw"/>
+	<oaf_attribute name="description-da" type="string" value="Mini-kommandolinje"/>
 	<oaf_attribute name="description-de" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-el" type="string" value="Μίνι-Δοιηκητής"/>
+	<oaf_attribute name="description-dz" type="string" value="གཙོ་དཔོན་ཆུང་བ།"/>
+	<oaf_attribute name="description-el" type="string" value="Μίνι-Διοικητής"/>
+	<oaf_attribute name="description-en_CA" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-en_GB" type="string" value="Mini-Commander"/>
 	<oaf_attribute name="description-es" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_AR" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_CL" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_CO" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_CR" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_DO" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_EC" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_ES" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_GT" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_HN" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_MX" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_NI" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_PA" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_PE" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_PR" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_SV" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_UY" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-es_VE" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-et" type="string" value="Pisi-käsurida"/>
+	<oaf_attribute name="description-eu" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-fa" type="string" value="فرمانده‌ی کوچک"/>
 	<oaf_attribute name="description-fi" type="string" value="Minikomentotulkki"/>
+	<oaf_attribute name="description-fr" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-ga" type="string" value="Ceannasaí-Beag"/>
 	<oaf_attribute name="description-gl" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-hu" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-it" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-ja" type="string" value="ミニコマンダー"/>
-	<oaf_attribute name="description-ko" type="string" value="작은 명령 실행기"/>
+	<oaf_attribute name="description-gu" type="string" value="નાનું આદેશક"/>
+	<oaf_attribute name="description-he" type="string" value="שורת פקודה קטנה"/>
+	<oaf_attribute name="description-hi" type="string" value="मिनी-कमांडर"/>
+	<oaf_attribute name="description-hr" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-hu" type="string" value="Parancssor"/>
+	<oaf_attribute name="description-hy" type="string" value="Մինի հրաման"/>
+	<oaf_attribute name="description-id" type="string" value="Tukang Perintah Mini"/>
+	<oaf_attribute name="description-it" type="string" value="Mini commander"/>
+	<oaf_attribute name="description-ja" type="string" value="小さなコマンド投入アプレットです"/>
+	<oaf_attribute name="description-ka" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-ko" type="string" value="작은 명령 실행"/>
+	<oaf_attribute name="description-ku" type="string" value="Serdarê Biçûk"/>
 	<oaf_attribute name="description-lt" type="string" value="Komandinė eilutė"/>
+	<oaf_attribute name="description-lv" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-mg" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-mk" type="string" value="Мини-управувач"/>
+	<oaf_attribute name="description-ml" type="string" value="മിനി-കമാന്‍ഡര്‍"/>
+	<oaf_attribute name="description-mn" type="string" value="Мини-Коммандер"/>
+	<oaf_attribute name="description-mr" type="string" value="मिनी-कमांडर"/>
 	<oaf_attribute name="description-ms" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-nn" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-no" type="string" value="Mini-kommander"/>
-	<oaf_attribute name="description-pl" type="string" value="Mini-Commander"/>
-	<oaf_attribute name="description-pt" type="string" value="Applet Mini-Comandante"/>
+	<oaf_attribute name="description-nb" type="string" value="Mini-kommander"/>
+	<oaf_attribute name="description-ne" type="string" value="सानो-आदेशकर्ता"/>
+	<oaf_attribute name="description-nl" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-nn" type="string" value="Kommandolinje"/>
+	<oaf_attribute name="description-oc" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-pa" type="string" value="ਮਿੰਨੀ-ਕਮਾਂਡਰ"/>
+	<oaf_attribute name="description-pl" type="string" value="Miniaturowy wiersz poleceń"/>
+	<oaf_attribute name="description-pt" type="string" value="Applet Mini-Commander"/>
 	<oaf_attribute name="description-pt_BR" type="string" value="Mini-Commander"/>
 	<oaf_attribute name="description-ro" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-ru" type="string" value="Даёт возможность вводить команды оболочки"/>
+	<oaf_attribute name="description-si" type="string" value="Mini-Commander"/>
 	<oaf_attribute name="description-sk" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-sl" type="string" value="Mini-upravnik"/>
+	<oaf_attribute name="description-sq" type="string" value="Mini-Komandues"/>
+	<oaf_attribute name="description-sr" type="string" value="Мали-наредник"/>
+	<oaf_attribute name="description-sr@Latn" type="string" value="Mali-narednik"/>
 	<oaf_attribute name="description-sv" type="string" value="Mini-Commander"/>
+	<oaf_attribute name="description-ta" type="string" value="குறுங்-கட்டளையாளர்"/>
+	<oaf_attribute name="description-te" type="string" value="చిరు ఆదేశకుడు"/>
+	<oaf_attribute name="description-th" type="string" value="แอพเพล็ตบรรทัดคำสั่ง"/>
+	<oaf_attribute name="description-tr" type="string" value="Küçük Komutan"/>
+	<oaf_attribute name="description-uk" type="string" value="Мініатюрний командний рядок"/>
+	<oaf_attribute name="description-vi" type="string" value="Bộ lệnh tí ti"/>
 	<oaf_attribute name="description-wa" type="string" value="Mini-Comandeu"/>
-	<oaf_attribute name="description-zh_TW" type="string" value="小型命令窗"/>
-	<oaf_attribute name="panel:category" type="string" value="Utility"/>
-	<oaf_attribute name="panel:category-da" type="string" value="Værktøj"/>
-	<oaf_attribute name="panel:category-it" type="string" value="Utilità"/>
-	<oaf_attribute name="panel:category-ja" type="string" value="ユーティリティ"/>
-	<oaf_attribute name="panel:category-ms" type="string" value="Utiliti"/>
-	<oaf_attribute name="panel:category-no" type="string" value="Verktøy"/>
-	<oaf_attribute name="panel:category-pl" type="string" value="Narzędzia"/>
-	<oaf_attribute name="panel:category-sk" type="string" value="Nástroj"/>
-	<oaf_attribute name="panel:category-sv" type="string" value="Verktyg"/>
-	<oaf_attribute name="panel:category-zh_TW" type="string" value="公用程式"/>
+	<oaf_attribute name="description-xh" type="string" value="Umyalelo-omNcinci"/>
+	<oaf_attribute name="description-zh_CN" type="string" value="小型命令行小程序"/>
+	<oaf_attribute name="description-zh_HK" type="string" value="小型命令列"/>
+	<oaf_attribute name="description-zh_TW" type="string" value="小型命令列"/>
 	<oaf_attribute name="panel:icon" type="string" value="gnome-mini-commander.png"/>
+	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+        <oaf_attribute name="bugzilla:component" type="string" value="mini-commander"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="mini_commander_applet"/>
 
 </oaf_server>
 
Index: mini-commander/src/mini-commander.ui
===================================================================
--- mini-commander/src/mini-commander.ui	(revision 0)
+++ mini-commander/src/mini-commander.ui	(revision 0)
@@ -0,0 +1,954 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">400</property>
+    <property name="lower">50</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">5</property>
+    <property name="page_size">10</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkDialog" id="mc_preferences_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Command Line Preferences</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_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="help_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</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="done_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </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="GtkNotebook" id="preferences_notebook">
+            <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="GtkVBox" id="general_page_vbox">
+                <property name="border_width">12</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkVBox" id="vbox10">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label24">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Auto Completion&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</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="GtkHBox" id="hbox6">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label25">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">    </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>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="auto_complete_history_toggle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">E_nable history-based auto completion</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <property name="active">False</property>
+                            <property name="inconsistent">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </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>
+                <child>
+                  <object class="GtkVBox" id="vbox11">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label26">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Size&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</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="GtkHBox" id="hbox7">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label27">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">    </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>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkLabel" id="size_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Width:</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="mnemonic_widget">size_spinner</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox9">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkSpinButton" id="size_spinner">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="climb_rate">10</property>
+                                    <property name="digits">0</property>
+                                    <property name="numeric">True</property>
+                                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                    <property name="snap_to_ticks">False</property>
+                                    <property name="wrap">False</property>
+                                    <property name="adjustment">adjustment1</property>
+                                    <accessibility>
+                                      <relation target="size_label" type="labelled-by"/>
+                                      <relation target="size_post_label" type="labelled-by"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="size_post_label">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">pixels</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>
+                                    <accessibility>
+                                      <relation target="size_spinner" type="label-for"/>
+                                    </accessibility>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</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>
+                      <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>
+                <child>
+                  <object class="GtkVBox" id="vbox12">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label28">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Colors&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</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="GtkHBox" id="hbox8">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="label29">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">    </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>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkTable" id="table2">
+                            <property name="visible">True</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <property name="homogeneous">False</property>
+                            <property name="row_spacing">6</property>
+                            <property name="column_spacing">12</property>
+                            <child>
+                              <object class="GtkCheckButton" id="default_theme_toggle">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Use default theme colors</property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="fg_color_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Command line _foreground:</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="mnemonic_widget">fg_color_picker</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="bg_color_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Command line _background:</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="mnemonic_widget">bg_color_picker</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkColorButton" id="fg_color_picker">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="use_alpha">False</property>
+                                <property name="title" translatable="yes">Pick a color</property>
+                                <property name="focus_on_click">True</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="x_options">fill</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkColorButton" id="bg_color_picker">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="use_alpha">False</property>
+                                <property name="title" translatable="yes">Pick a color</property>
+                                <property name="focus_on_click">True</property>
+                              </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">fill</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </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>
+                  <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="general_label">
+                <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>
+              </object>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox13">
+                <property name="border_width">12</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label30">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Macros:</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="mnemonic_widget">macros_tree</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox4">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="macros_scrolled_tree">
+                        <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="macros_tree">
+                            <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>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox7">
+                        <property name="border_width">4</property>
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkButton" id="add_button">
+                            <property name="visible">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</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="hbox3">
+                                    <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="label20">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">_Add Macro...</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>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="delete_button">
+                            <property name="visible">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</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="image1">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-delete</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="label19">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">_Delete Macro</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>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</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>
+              <packing>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label21">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Macros</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>
+              </object>
+            </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="-11">help_button</action-widget>
+      <action-widget response="-7">done_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="mc_macro_add_dialog">
+    <property name="border_width">5</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Add New Macro</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">False</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="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="helpbutton1">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</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="button1">
+                <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="button2">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-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="GtkTable" id="table3">
+            <property name="border_width">5</property>
+            <property name="visible">True</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="homogeneous">False</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="pattern_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Pattern:</property>
+                <property name="use_underline">True</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="mnemonic_widget">pattern_entry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="right_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="bottom_attach">1</property>
+                <property name="x_options">fill</property>
+                <property name="y_options"/>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="command_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Co_mmand:</property>
+                <property name="use_underline">True</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="mnemonic_widget">command_entry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="right_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">fill</property>
+                <property name="y_options"/>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="pattern_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">True</property>
+                <property name="visibility">True</property>
+                <property name="max_length">0</property>
+                <property name="text" translatable="yes"/>
+                <property name="has_frame">True</property>
+                <property name="invisible_char" translatable="yes">*</property>
+                <property name="activates_default">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="bottom_attach">1</property>
+                <property name="y_options"/>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="command_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">True</property>
+                <property name="visibility">True</property>
+                <property name="max_length">0</property>
+                <property name="text" translatable="yes"/>
+                <property name="has_frame">True</property>
+                <property name="invisible_char" translatable="yes">*</property>
+                <property name="activates_default">True</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>
+          </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="-11">helpbutton1</action-widget>
+      <action-widget response="-6">button1</action-widget>
+      <action-widget response="-5">button2</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: mini-commander/src/Makefile.am
===================================================================
--- mini-commander/src/Makefile.am	(revision 10735)
+++ mini-commander/src/Makefile.am	(working copy)
@@ -4,7 +4,6 @@
 	-I.				\
 	-I$(srcdir)			\
 	$(GNOME_APPLETS_CFLAGS)		\
-	$(LIBGLADE_CFLAGS)		\
 	$(WARN_CFLAGS)			\
 	$(GNOME_INCLUDEDIR)
 
@@ -35,8 +34,7 @@
 	mc-default-macros.h
 
 mini_commander_applet_LDADD =	\
-	$(GNOME_APPLETS_LIBS)	\
-	$(LIBGLADE_LIBS)
+	$(GNOME_APPLETS_LIBS)
 
 mc_install_default_macros_SOURCES =	\
 	mc-install-default-macros.c	\
@@ -45,7 +43,7 @@
 mc_install_default_macros_LDADD =	\
 	$(GNOME_APPLETS_LIBS)
 
-glade_DATA = mini-commander.glade
+builder_DATA = mini-commander.ui
 
 BITMAPS = 			\
 	browser-mini.xpm	\
@@ -85,5 +83,5 @@
 	$(desktop_icons_DATA)			\
 	$(BITMAPS)				\
 	$(ui_DATA)				\
-	$(glade_DATA)				\
+	$(builder_DATA)				\
 	$(schemas_in_files)
Index: modemlights/modemlights.ui
===================================================================
--- modemlights/modemlights.ui	(revision 0)
+++ modemlights/modemlights.ui	(revision 0)
@@ -0,0 +1,294 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkDialog" id="auth_dialog">
+    <property name="title" translatable="yes">Enter password</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">True</property>
+    <property name="resizable">False</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="has_separator">False</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="has_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-ok</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="GtkHBox" id="hbox1">
+            <property name="border_width">7</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="stock">gnome-stock-authentication</property>
+                <property name="icon_size">6</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</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="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Root password required&lt;/span&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</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>
+                <child>
+                  <object class="GtkLabel" id="auth_dialog_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes"/>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">True</property>
+                    <property name="selectable">True</property>
+                    <property name="xalign">0</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>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Password:</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>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="auth_dialog_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">True</property>
+                        <property name="visibility">False</property>
+                        <property name="max_length">0</property>
+                        <property name="text" translatable="yes"/>
+                        <property name="has_frame">True</property>
+                        <property name="invisible_char">*</property>
+                        <property name="activates_default">True</property>
+                      </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">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </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">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancelbutton1</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkWindow" id="report_window">
+    <property name="title" translatable="yes"/>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">True</property>
+    <property name="resizable">False</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>
+    <child>
+      <object class="GtkHBox" id="hbox3">
+        <property name="border_width">12</property>
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkImage" id="report_window_image">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="yalign">0</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Connecting with Internet Service Provider&lt;/span&gt;</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">True</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>
+            <child>
+              <object class="GtkProgressBar" id="report_window_progress">
+                <property name="visible">True</property>
+                <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+                <property name="fraction">0</property>
+                <property name="pulse_step">0.10000000149</property>
+                <property name="text" translatable="yes"/>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
Index: modemlights/modem-applet.c
===================================================================
--- modemlights/modem-applet.c	(revision 10735)
+++ modemlights/modem-applet.c	(working copy)
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <libxml/tree.h>
-#include <glade/glade.h>
 
 #ifdef __FreeBSD__
 #include <sys/ioctl.h>
@@ -53,7 +52,7 @@
 struct _ModemAppletPrivate
 {
   /* applet UI stuff */
-  GladeXML     *xml;
+  GtkBuilder   *builder;
   GtkIconTheme *icon_theme;
   GdkPixbuf    *icon;
   GtkWidget    *image;
@@ -178,18 +177,19 @@
 
   priv = MODEM_APPLET_GET_PRIVATE (applet);
 
-  priv->xml = glade_xml_new (GNOME_GLADEDIR "/modemlights.glade", NULL, NULL);
+  priv->builder = gtk_builder_new ();
+  gtk_builder_add_from_file (priv->builder, GTK_BUILDERDIR "/modemlights.ui", NULL);
   priv->icon = NULL;
   priv->icon_theme = gtk_icon_theme_get_default ();
   priv->image = gtk_image_new ();
 
-  priv->auth_dialog       = glade_xml_get_widget (priv->xml, "auth_dialog");
-  priv->auth_dialog_label = glade_xml_get_widget (priv->xml, "auth_dialog_label");
-  priv->auth_dialog_entry = glade_xml_get_widget (priv->xml, "auth_dialog_entry");
+  priv->auth_dialog       = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog"));
+  priv->auth_dialog_label = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog_label"));
+  priv->auth_dialog_entry = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog_entry"));
 
-  priv->report_window          = glade_xml_get_widget (priv->xml, "report_window");
-  priv->report_window_image    = glade_xml_get_widget (priv->xml, "report_window_image");
-  priv->report_window_progress = glade_xml_get_widget (priv->xml, "report_window_progress");
+  priv->report_window          = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window"));
+  priv->report_window_image    = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window_image"));
+  priv->report_window_progress = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window_progress"));
 
   g_signal_connect (G_OBJECT (priv->report_window), "delete-event",
 		    G_CALLBACK (gtk_widget_hide), NULL);
Index: modemlights/Makefile.am
===================================================================
--- modemlights/Makefile.am	(revision 10735)
+++ modemlights/Makefile.am	(working copy)
@@ -1,8 +1,7 @@
 #SUBDIRS = docs
 
 INCLUDES = -I. -I$(srcdir) 				\
-	$(GNOME_APPLETS_CFLAGS)				\
-	$(LIBGLADE_CFLAGS)
+	$(GNOME_APPLETS_CFLAGS)	
 
 libexec_PROGRAMS = modem_applet
 
@@ -12,7 +11,6 @@
 
 modem_applet_LDADD = 		\
 	$(GNOME_APPLETS_LIBS)	\
-	$(LIBGLADE_LIBS)	\
 	$(MODEMLIGHTS_LIBS)
 
 uidir	= $(datadir)/gnome-2.0/ui
@@ -30,7 +28,7 @@
 
 @INTLTOOL_SERVER_RULE@
 
-glade_DATA = modemlights.glade
+builder_DATA = modemlights.ui
 
 icons = \
 	gnome-modem-monitor-applet.svg	  \
@@ -42,7 +40,7 @@
 EXTRA_DIST =				\
 	GNOME_ModemLights.server.in.in	\
 	$(icons)			\
-	$(glade_DATA)			\
+	$(builder_DATA)			\
 	$(ui_DATA)
 
 uninstall-local:
