--- old/src/gui/data/packagemanager.glade	2008-10-09 14:29:56.474927018 +0100
+++ new/src/gui/data/packagemanager.glade	2008-10-09 14:29:56.376427292 +0100
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Sep  9 08:23:45 2008 -->
+<!--Generated with glade3 3.4.5 on Wed Oct  8 10:46:15 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="mainwindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Package Manager</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="default_width">800</property>
-    <property name="default_height">600</property>
+    <property name="default_width">750</property>
+    <property name="default_height">615</property>
     <property name="icon">PM_app_48x.png</property>
     <signal name="delete_event" handler="on_mainwindow_delete_event"/>
     <child>
@@ -31,8 +31,8 @@
                     <child>
                       <widget class="GtkMenuItem" id="file_be">
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">BE management</property>
-                        <property name="label" translatable="yes">BE management</property>
+                        <property name="tooltip" translatable="yes">Boot Environment Management</property>
+                        <property name="label" translatable="yes">Boot Environment Management</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_file_be_activate"/>
                       </widget>
@@ -203,6 +203,27 @@
               </widget>
             </child>
             <child>
+              <widget class="GtkMenuItem" id="settings">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Settings</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu4">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkMenuItem" id="settings_edit_repositories">
+                        <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Edit Repositories</property>
+                        <property name="label" translatable="yes">Edit Repositories...</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_settings_edit_repositories_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkMenuItem" id="help">
                 <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>
@@ -215,13 +236,21 @@
                     <child>
                       <widget class="GtkMenuItem" id="help_about">
                         <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="tooltip" translatable="yes">About dialog</property>
+                        <property name="tooltip" translatable="yes">About</property>
                         <property name="label" translatable="yes">About</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_help_about_activate"/>
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="online_help">
+                        <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Online Help</property>
+                        <property name="label" translatable="yes">Online Help</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_help_help_activate"/>
+                      </widget>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -232,110 +261,121 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="hbox1">
+          <widget class="GtkToolbar" id="actiontoolbar">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <child>
-              <widget class="GtkToolbar" id="actiontoolbar">
+              <widget class="GtkToolButton" id="reloadbutton">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkToolButton" id="reloadbutton">
-                    <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">Reload</property>
-                    <property name="stock_id">gtk-refresh</property>
-                    <signal name="clicked" handler="on_reload_button_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="update_all_button">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Update All</property>
-                    <property name="stock_id">gtk-redo</property>
-                    <signal name="clicked" handler="on_update_all_button_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="install_update_button">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Install/Update</property>
-                    <property name="stock_id">gtk-apply</property>
-                    <signal name="clicked" handler="on_install_update_button_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="remove_button">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Remove</property>
-                    <property name="stock_id">gtk-remove</property>
-                    <signal name="clicked" handler="on_remove_button_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">Reload</property>
+                <property name="icon">reload24x.png</property>
+                <signal name="clicked" handler="on_reload_button_clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="update_all_button">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Update All</property>
+                <property name="icon">update_all24x.png</property>
+                <signal name="clicked" handler="on_update_all_button_clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="install_update_button">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Install/Update</property>
+                <property name="icon">install_update24x.png</property>
+                <signal name="clicked" handler="on_install_update_button_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame1">
+              <widget class="GtkToolButton" id="remove_button">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="label_yalign">1</property>
-                <property name="shadow_type">GTK_SHADOW_OUT</property>
+                <property name="label" translatable="yes">Remove</property>
+                <property name="icon">remove24x.png</property>
+                <signal name="clicked" handler="on_remove_button_clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="toolbutton2">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkToolItem" id="toolbutton3">
+                <property name="visible">True</property>
                 <child>
-                  <widget class="GtkFixed" id="fixed2">
-                    <property name="width_request">300</property>
+                  <widget class="GtkToolItem" id="toolbutton1">
                     <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="yalign">0.60000002384185791</property>
-                        <property name="label" translatable="yes">&lt;i&gt;Repository:&lt;/i&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="x">5</property>
-                        <property name="y">18</property>
-                      </packing>
-                    </child>
+                    <property name="resize_mode">GTK_RESIZE_QUEUE</property>
                     <child>
-                      <widget class="GtkComboBox" id="repositorycombobox">
-                        <property name="width_request">205</property>
+                      <widget class="GtkAlignment" id="alignment9">
                         <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>
-                        <signal name="changed" handler="on_repositorycombobox_changed"/>
+                        <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+                        <property name="xalign">1</property>
+                        <property name="top_padding">11</property>
+                        <property name="bottom_padding">11</property>
+                        <property name="left_padding">97</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox16">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkLabel" id="label1">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">1</property>
+                                <property name="yalign">0.60000002384185791</property>
+                                <property name="label" translatable="yes">&lt;i&gt;Repository:&lt;/i&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="repositorycombobox">
+                                <property name="width_request">205</property>
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <signal name="changed" handler="on_repositorycombobox_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
                       </widget>
-                      <packing>
-                        <property name="x">90</property>
-                        <property name="y">12</property>
-                      </packing>
                     </child>
                   </widget>
                 </child>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
           </widget>
@@ -407,7 +447,7 @@
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="border_width">6</property>
-                    <property name="spacing">12</property>
+                    <property name="spacing">50</property>
                     <child>
                       <widget class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
@@ -440,16 +480,19 @@
                       <widget class="GtkHBox" id="hbox5">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="spacing">6</property>
                         <child>
                           <widget class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Search:</property>
                           </widget>
+                          <packing>
+                            <property name="padding">6</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkEntry" id="searchentry">
+                            <property name="width_request">177</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -462,6 +505,30 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkButton" id="clear_search">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="on_clear_search_clicked"/>
+                            <child>
+                              <widget class="GtkImage" id="clear_image">
+                                <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>
@@ -665,6 +732,34 @@
                                 <property name="tab_fill">False</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="scrolledwindow16">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <child>
+                                  <widget class="GtkTextView" id="licensetextview">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label23">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Licenses</property>
+                              </widget>
+                              <packing>
+                                <property name="type">tab</property>
+                                <property name="position">3</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
                             <property name="position">1</property>
@@ -715,6 +810,7 @@
     <property name="title" translatable="yes">Install / Update Confirmation</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -883,6 +979,7 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Package Download Preferences</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <signal name="delete_event" handler="downloadpreferences_delete_event"/>
@@ -1085,6 +1182,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -1100,23 +1198,23 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkProgressBar" id="downloadprogress">
+              <widget class="GtkLabel" id="packagedependencies2">
                 <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="text" translatable="yes"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Downloading files...</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="packagedependencies2">
+              <widget class="GtkProgressBar" id="downloadprogress">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Downloading files...</property>
-                <property name="use_markup">True</property>
+                <property name="text" translatable="yes"></property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -1210,6 +1308,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -1225,23 +1324,23 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkProgressBar" id="createplanprogress">
+              <widget class="GtkLabel" id="packagedependencies">
                 <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="text" translatable="yes"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Checking package dependencies...</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="packagedependencies">
+              <widget class="GtkProgressBar" id="createplanprogress">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Checking package dependencies...</property>
-                <property name="use_markup">True</property>
+                <property name="text" translatable="yes"></property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -1335,6 +1434,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -1350,23 +1450,23 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkProgressBar" id="installingprogress">
+              <widget class="GtkLabel" id="packagedependencies3">
                 <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="text" translatable="yes"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Installing Packages...</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="packagedependencies3">
+              <widget class="GtkProgressBar" id="installingprogress">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Installing Packages...</property>
-                <property name="use_markup">True</property>
+                <property name="text" translatable="yes"></property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -1449,6 +1549,7 @@
     <property name="title" translatable="yes">Remove Confirmation</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -1627,9 +1728,10 @@
     <property name="title" translatable="yes">About Glade</property>
     <property name="resizable">False</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="program_name">Package Manager</property>
-    <property name="version">0.1</property>
+    <property name="version">0.2</property>
     <property name="copyright" translatable="yes">Copyright 2008 Sun Microsystems, Inc.  
 All rights reserved.
 Use is subject to license terms.</property>
@@ -1978,7 +2080,8 @@
 John Hawk &lt;johnthawk@excite.com&gt;
 John Rice &lt;John.Rice@Sun.Com&gt;
 Jenya Gestrin &lt;Jenya.Gestrin@Sun.Com&gt;
-Frank Ludolph &lt;Frank.Ludolph@Sun.Com&gt;</property>
+Frank Ludolph &lt;Frank.Ludolph@Sun.Com&gt;
+Padraig O'Briain &lt;Padraig.Obriain@Sun.Com&gt;</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox9">
         <property name="visible">True</property>
@@ -2009,6 +2112,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -2024,23 +2128,23 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkProgressBar" id="removingprogress">
+              <widget class="GtkLabel" id="packagedependencies4">
                 <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="text" translatable="yes"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Removing Packages...</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="packagedependencies4">
+              <widget class="GtkProgressBar" id="removingprogress">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Removing Packages...</property>
-                <property name="use_markup">True</property>
+                <property name="text" translatable="yes"></property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -2122,6 +2226,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -2137,23 +2242,23 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">10</property>
             <child>
-              <widget class="GtkProgressBar" id="createplanprogress2">
+              <widget class="GtkLabel" id="packagedependencies5">
                 <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="text" translatable="yes"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Checking package dependencies...</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="packagedependencies5">
+              <widget class="GtkProgressBar" id="createplanprogress2">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Checking package dependencies...</property>
-                <property name="use_markup">True</property>
+                <property name="text" translatable="yes"></property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -2246,6 +2351,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -2343,6 +2449,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
@@ -2358,23 +2465,23 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">6</property>
             <child>
-              <widget class="GtkProgressBar" id="progressbar">
+              <widget class="GtkLabel" id="progressinfo">
                 <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="text" translatable="yes"></property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Checking for latest SUNWipkg and SUNWipkg-gui, please wait...</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="progressinfo">
+              <widget class="GtkProgressBar" id="progressbar">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Checking for latest SUNWipkg and SUNWipkg-gui, please wait...</property>
-                <property name="use_markup">True</property>
+                <property name="text" translatable="yes"></property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -2425,6 +2532,7 @@
     <property name="title" translatable="yes">Boot Environment Management</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
@@ -2635,10 +2743,14 @@
     </child>
   </widget>
   <widget class="GtkDialog" id="repository">
+    <property name="width_request">520</property>
+    <property name="height_request">400</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Edit Repository</property>
+    <property name="title" translatable="yes">Edit Repositories</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="transient_for">mainwindow</property>
     <property name="opacity">0.99999999977648257</property>
@@ -2653,6 +2765,7 @@
             <child>
               <widget class="GtkVBox" id="vbox18">
                 <property name="visible">True</property>
+                <property name="spacing">5</property>
                 <child>
                   <widget class="GtkLabel" id="label26">
                     <property name="visible">True</property>
@@ -2666,13 +2779,15 @@
                 </child>
                 <child>
                   <widget class="GtkLabel" id="label27">
+                    <property name="width_request">500</property>
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
                     <property name="xpad">10</property>
                     <property name="ypad">4</property>
-                    <property name="label" translatable="yes">Enter the complete PKG line of the repository you want to add as a source
-and give it a name.</property>
+                    <property name="label" translatable="yes">Enter the repository name and URL you want to add as a new package source. 
+Select from the list to modify or remove existing repositories.</property>
+                    <property name="wrap">True</property>
                   </widget>
                   <packing>
                     <property name="position">1</property>
@@ -2683,12 +2798,15 @@
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkLabel" id="label28">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="xpad">10</property>
                         <property name="ypad">4</property>
-                        <property name="label" translatable="yes">Name: </property>
+                        <property name="label" translatable="yes">_Name: </property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">repositoryname</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -2696,46 +2814,18 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="entry3">
+                      <widget class="GtkEntry" id="repositoryname">
+                        <property name="width_request">320</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <signal name="changed" handler="on_repositoryname_changed"/>
                       </widget>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="padding">3</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkFrame" id="1">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment8">
-                            <property name="visible">True</property>
-                            <property name="left_padding">75</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label29">
-                            <property name="visible">True</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">45</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </widget>
                   <packing>
                     <property name="position">2</property>
@@ -2745,69 +2835,50 @@
                   <widget class="GtkHBox" id="hbox12">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label30">
+                      <widget class="GtkLabel" id="label21">
+                        <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="xpad">9</property>
+                        <property name="xpad">10</property>
                         <property name="ypad">4</property>
-                        <property name="label" translatable="yes">URL:    </property>
+                        <property name="label" translatable="yes">_URL: </property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">repositoryurl</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="padding">5</property>
+                        <property name="padding">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkEntry" id="entry4">
+                      <widget class="GtkEntry" id="repositoryurl">
+                        <property name="width_request">320</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <signal name="changed" handler="on_repositoryurl_changed"/>
                       </widget>
                       <packing>
-                        <property name="padding">4</property>
+                        <property name="expand">False</property>
+                        <property name="padding">3</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="frame7">
+                      <widget class="GtkButton" id="repositoryadd">
+                        <property name="width_request">50</property>
                         <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment15">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <child>
-                              <widget class="GtkVButtonBox" id="vbuttonbox6">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkButton" id="button4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">Add</property>
-                                    <property name="response_id">0</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <placeholder/>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">_Add</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="on_repositoryadd_clicked"/>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="padding">5</property>
+                        <property name="padding">10</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -2823,12 +2894,15 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkHSeparator" id="hseparator13">
+              <widget class="GtkAlignment" id="alignment5">
                 <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="padding">4</property>
+                <property name="padding">10</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -2842,122 +2916,53 @@
                     <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <child>
-                      <widget class="GtkTextView" id="textview1">
+                      <widget class="GtkTreeView" id="repositorytreeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="headers_clickable">True</property>
+                        <signal name="move_cursor" handler="on_repositorytreeview_move_cursor"/>
+                        <signal name="button_release_event" handler="on_repositorytreeview_button_release_event"/>
                       </widget>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="padding">10</property>
+                  </packing>
                 </child>
                 <child>
-                  <widget class="GtkVButtonBox" id="vbuttonbox2">
+                  <widget class="GtkVButtonBox" id="vbuttonbox1">
                     <property name="visible">True</property>
+                    <property name="spacing">5</property>
+                    <property name="layout_style">GTK_BUTTONBOX_START</property>
                     <child>
-                      <widget class="GtkFrame" id="frame5">
+                      <widget class="GtkButton" id="repositorymodify">
                         <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment13">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="left_padding">6</property>
-                            <child>
-                              <widget class="GtkVButtonBox" id="vbuttonbox5">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkButton" id="button1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">Remove</property>
-                                    <property name="response_id">0</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <placeholder/>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">_Modify...</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="on_repositorymodify_clicked"/>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkFrame" id="frame6">
+                      <widget class="GtkButton" id="repositoryremove">
                         <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment14">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <placeholder/>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">_Remove</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="on_repositoryremove_clicked"/>
                       </widget>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkFrame" id="frame2">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment9">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <widget class="GtkVButtonBox" id="vbuttonbox4">
-                                <property name="visible">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label31">
-                            <property name="visible">True</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
-                    </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>
@@ -2972,7 +2977,7 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="padding">4</property>
+                <property name="padding">10</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -2986,37 +2991,15 @@
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button5">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="response_id">0</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button6">
+              <widget class="GtkButton" id="repositoryclose">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">Reset</property>
-                <property name="response_id">0</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">OK</property>
+                <property name="label" translatable="yes">_Close</property>
+                <property name="use_underline">True</property>
                 <property name="response_id">0</property>
+                <signal name="clicked" handler="on_repositoryclose_clicked"/>
               </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
             </child>
           </widget>
           <packing>
@@ -3035,6 +3018,7 @@
     <property name="title" translatable="yes">BE Management Changes Confirmation</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="deletable">False</property>
     <property name="transient_for">beadmin</property>
@@ -3227,4 +3211,162 @@
       </widget>
     </child>
   </widget>
+  <widget class="GtkDialog" id="repositorymodif">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Modify Repository</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon">PM_app_48x.png</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="transient_for">repository</property>
+    <property name="opacity">0.99999999977648257</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox24">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox16">
+            <property name="visible">True</property>
+            <property name="spacing">5</property>
+            <child>
+              <widget class="GtkLabel" id="label22">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="xpad">10</property>
+                <property name="ypad">2</property>
+                <property name="label" translatable="yes">&lt;b&gt;Modify Repository&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox10">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label24">
+                    <property name="width_request">80</property>
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="xpad">10</property>
+                    <property name="ypad">4</property>
+                    <property name="label" translatable="yes">_Name: </property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">repositorymodifyname</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="repositorymodifyname">
+                    <property name="width_request">320</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">3</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox14">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label25">
+                    <property name="width_request">80</property>
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="xpad">10</property>
+                    <property name="ypad">4</property>
+                    <property name="label" translatable="yes">_URL: </property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">repositorymodifyurl</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="repositorymodifyurl">
+                    <property name="width_request">320</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">3</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHSeparator" id="hseparator11">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">10</property>
+                <property name="position">3</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_area24">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="repositorymodifycancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_repositorymodifycancel_clicked"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="repositorymodifyok">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_repositorymodifyok_clicked"/>
+              </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>