--- data/memaker.ui.orig	2009-10-01 16:42:23.495979025 +0100
+++ data/memaker.ui	2009-10-01 23:31:57.798981222 +0100
@@ -82,7 +82,7 @@
                       <object class="GtkImageMenuItem" id="menuItemRestore">
                         <property name="label" translatable="yes">Restore</property>
                         <property name="visible">True</property>
-                        <property name="image">image3</property>
+                        <property name="image">gtk-undo-image</property>
                         <property name="use_stock">False</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="menu5">
@@ -179,7 +179,7 @@
           <object class="GtkHBox" id="hbox4">
             <property name="visible">True</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="mainwin-hbox">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
@@ -371,7 +371,7 @@
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="homogeneous">True</property>
                             <child>
-                              <object class="GtkImage" id="image1">
+                              <object class="GtkImage" id="memaker-headlabel">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="pixbuf">headLabel.png</property>
@@ -1700,7 +1700,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label1">
+                              <object class="GtkLabel" id="beard-label">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Beard</property>
@@ -1781,7 +1781,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="image1">
+  <object class="GtkImage" id="gtk-save-as-image">
     <property name="visible">True</property>
     <property name="stock">gtk-save-as</property>
     <property name="icon-size">1</property>
@@ -1802,7 +1802,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox-prefrences-vbox1">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
@@ -1847,7 +1847,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label3">
+                          <object class="GtkLabel" id="label-allow-launchpad">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Allow MeMaker to use my Launchpad account</property>
                           </object>
@@ -1877,7 +1877,7 @@
               </object>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label-launchpad-support">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Launchpad Support</property>
               </object>
@@ -1921,7 +1921,7 @@
       <action-widget response="0">closePreferencesButton</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image2">
+  <object class="GtkImage" id="gtk-apply-image">
     <property name="visible">True</property>
     <property name="stock">gtk-apply</property>
   </object>
@@ -1952,7 +1952,7 @@
               </object>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label-page1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">page 1</property>
               </object>
@@ -2094,11 +2094,11 @@
     </action-widgets>
   </object>
   <object class="GtkAction" id="action1"/>
-  <object class="GtkImage" id="image4">
+  <object class="GtkImage" id="gtk-go-forword">
     <property name="visible">True</property>
     <property name="stock">gtk-go-forward</property>
   </object>
-  <object class="GtkImage" id="image3">
+  <object class="GtkImage" id="gtk-undo-image">
     <property name="visible">True</property>
     <property name="stock">gtk-undo</property>
     <property name="icon-size">1</property>