From http://www.jwz.org/xscreensaver/xscreensaver-5.29.tar.gz
[xscreensaver] / driver / xscreensaver-demo.glade2
index 4e51989631d55da3c7b73847dad0411c12f1b075..609e51012a47d66ee3aff904b8ab63d1f4d6d0b9 100644 (file)
@@ -2,16 +2,22 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="xscreensaver_demo">
   <property name="title" translatable="yes">XScreenSaver</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="wmclass_name">xscreensaver</property>
-  <property name="wmclass_class">XScreenSaver</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="outer_vbox">
       <child>
        <widget class="GtkMenuBar" id="menubar">
          <property name="visible">True</property>
+         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+         <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
          <child>
            <widget class="GtkMenuItem" id="file">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_File</property>
              <property name="use_underline">True</property>
+             <signal name="activate" handler="file_menu_cb" last_modification_time="Sun, 06 Mar 2005 21:41:13 GMT"/>
 
              <child>
                <widget class="GtkMenu" id="file_menu">
       </child>
 
       <child>
-       <widget class="GtkNotebook" id="notebook">
+       <widget class="GtkHBox" id="spacer_hbox">
+         <property name="border_width">8</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="tab_hborder">2</property>
-         <property name="tab_vborder">2</property>
-         <property name="enable_popup">False</property>
-         <signal name="switch_page" handler="switch_page_cb"/>
+         <property name="homogeneous">False</property>
+         <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkTable" id="demos_table">
-             <property name="border_width">10</property>
+           <widget class="GtkNotebook" id="notebook">
              <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">0</property>
-             <property name="column_spacing">0</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>
+             <signal name="switch_page" handler="switch_page_cb"/>
 
              <child>
-               <widget class="GtkTable" id="blanking_table">
+               <widget class="GtkTable" id="demos_table">
+                 <property name="border_width">10</property>
                  <property name="visible">True</property>
-                 <property name="n_rows">3</property>
-                 <property name="n_columns">4</property>
+                 <property name="n_rows">2</property>
+                 <property name="n_columns">2</property>
                  <property name="homogeneous">False</property>
-                 <property name="row_spacing">2</property>
+                 <property name="row_spacing">0</property>
                  <property name="column_spacing">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="cycle_label">
+                   <widget class="GtkTable" id="blanking_table">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Cycle After</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">1</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">8</property>
-                     <property name="ypad">0</property>
-                     <property name="mnemonic_widget">cycle_spinbutton</property>
+                     <property name="n_rows">3</property>
+                     <property name="n_columns">4</property>
+                     <property name="homogeneous">False</property>
+                     <property name="row_spacing">2</property>
+                     <property name="column_spacing">0</property>
+
+                     <child>
+                       <widget class="GtkLabel" id="cycle_label">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">_Cycle After</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">1</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">8</property>
+                         <property name="ypad">0</property>
+                         <property name="mnemonic_widget">cycle_spinbutton</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>
+                         <accessibility>
+                           <atkrelation target="cycle_spinbutton" type="label-for"/>
+                           <atkrelation target="cycle_spinbutton" type="flows-to"/>
+                         </accessibility>
+                       </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="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkEventBox" id="lock_button_eventbox">
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">Whether a password should be required to un-blank the screen.</property>
+                         <property name="visible_window">True</property>
+                         <property name="above_child">False</property>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="lock_button">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">_Lock Screen After  </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>
+                             <accessibility>
+                               <atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen</atkproperty>
+                               <atkrelation target="lock_spinbutton" type="controller-for"/>
+                               <atkrelation target="lock_spinbutton" type="label-for"/>
+                               <atkrelation target="lock_spinbutton" type="flows-to"/>
+                             </accessibility>
+                             <signal name="toggled" handler="pref_changed_cb"/>
+                           </widget>
+                         </child>
+                       </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="GtkSpinButton" id="timeout_spinbutton">
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">How long before the screen saver activates.</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">15</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">True</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">1 1 720 1 15 0</property>
+                         <accessibility>
+                           <atkrelation target="timeout_label" type="labelled-by"/>
+                           <atkrelation target="timeout_mlabel" type="labelled-by"/>
+                           <atkrelation target="timeout_label" type="flows-from"/>
+                           <atkrelation target="timeout_mlabel" type="flows-to"/>
+                         </accessibility>
+                         <signal name="activate" handler="pref_changed_cb"/>
+                         <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                         <signal name="value_changed" handler="pref_changed_cb"/>
+                       </widget>
+                       <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"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkSpinButton" id="lock_spinbutton">
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">How long after the screen blanks until a password will be required.</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">15</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">True</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">0 0 720 1 15 0</property>
+                         <accessibility>
+                           <atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen After</atkproperty>
+                           <atkrelation target="lock_button" type="controlled-by"/>
+                           <atkrelation target="lock_button" type="labelled-by"/>
+                           <atkrelation target="lock_mlabel" type="labelled-by"/>
+                           <atkrelation target="lock_button" type="flows-from"/>
+                           <atkrelation target="lock_mlabel" type="flows-to"/>
+                         </accessibility>
+                         <signal name="activate" handler="pref_changed_cb"/>
+                         <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                         <signal name="value_changed" handler="pref_changed_cb"/>
+                       </widget>
+                       <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="y_padding">10</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkSpinButton" id="cycle_spinbutton">
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">How long each display mode should run before choosing a new one (in Random mode.)</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">15</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">True</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">0 0 720 1 15 0</property>
+                         <accessibility>
+                           <atkrelation target="cycle_label" type="labelled-by"/>
+                           <atkrelation target="cycle_mlabel" type="labelled-by"/>
+                           <atkrelation target="cycle_label" type="flows-from"/>
+                           <atkrelation target="cycle_mlabel" type="flows-to"/>
+                         </accessibility>
+                         <signal name="activate" handler="pref_changed_cb"/>
+                         <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                         <signal name="value_changed" handler="pref_changed_cb"/>
+                       </widget>
+                       <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"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="lock_mlabel">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">minutes</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</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">8</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>
+                         <accessibility>
+                           <atkrelation target="lock_spinbutton" type="label-for"/>
+                           <atkrelation target="lock_spinbutton" type="flows-to"/>
+                         </accessibility>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">3</property>
+                         <property name="right_attach">4</property>
+                         <property name="top_attach">2</property>
+                         <property name="bottom_attach">3</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="cycle_mlabel">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">minutes</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</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">8</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>
+                         <accessibility>
+                           <atkrelation target="cycle_spinbutton" type="label-for"/>
+                           <atkrelation target="cycle_spinbutton" type="flows-from"/>
+                         </accessibility>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">3</property>
+                         <property name="right_attach">4</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="timeout_label">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">_Blank After</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">1</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">8</property>
+                         <property name="ypad">0</property>
+                         <property name="mnemonic_widget">timeout_spinbutton</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>
+                         <accessibility>
+                           <atkrelation target="timeout_spinbutton" type="label-for"/>
+                           <atkrelation target="timeout_spinbutton" type="flows-to"/>
+                         </accessibility>
+                       </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="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="timeout_mlabel">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">minutes</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</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">8</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>
+                         <accessibility>
+                           <atkrelation target="timeout_spinbutton" type="label-for"/>
+                           <atkrelation target="timeout_spinbutton" type="flows-from"/>
+                         </accessibility>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">3</property>
+                         <property name="right_attach">4</property>
+                         <property name="top_attach">0</property>
+                         <property name="bottom_attach">1</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
                    </widget>
                    <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">2</property>
+                     <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>
+                     <property name="y_options">fill</property>
                    </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkEventBox" id="lock_button_eventbox">
+                   <widget class="GtkHButtonBox" id="demo_manual_hbbox">
                      <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Whether a password should be required to un-blank the screen.</property>
+                     <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                     <property name="spacing">30</property>
 
                      <child>
-                       <widget class="GtkCheckButton" id="lock_button">
+                       <widget class="GtkButton" id="demo">
                          <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">Demo the selected screen saver in full-screen mode (click the mouse to return.)</property>
+                         <property name="can_default">True</property>
                          <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">_Lock Screen After</property>
+                         <property name="label" translatable="yes">_Preview</property>
                          <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <signal name="toggled" handler="pref_changed_cb"/>
+                         <property name="focus_on_click">True</property>
+                         <signal name="clicked" handler="run_this_cb"/>
                        </widget>
                      </child>
-                   </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="GtkLabel" id="timeout_label">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Blank After</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">1</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">8</property>
-                     <property name="ypad">0</property>
-                     <property name="mnemonic_widget">timeout_spinbutton</property>
+                     <child>
+                       <widget class="GtkButton" id="settings">
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">Customization and explanation of the selected screen saver.</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">_Settings...</property>
+                         <property name="use_underline">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <signal name="clicked" handler="settings_cb"/>
+                       </widget>
+                     </child>
                    </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="x_options">fill</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSpinButton" id="timeout_spinbutton">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">How long before the monitor goes completely black.</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">15</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">True</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">True</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">1 1 720 1 15 15</property>
-                     <signal name="activate" handler="pref_changed_cb"/>
-                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                     <signal name="value_changed" handler="pref_changed_cb"/>
-                   </widget>
-                   <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="top_attach">1</property>
+                     <property name="bottom_attach">2</property>
                      <property name="x_options">fill</property>
-                     <property name="y_options"></property>
+                     <property name="y_options">fill</property>
                    </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkLabel" id="timeout_mlabel">
+                   <widget class="GtkVBox" id="list_vbox">
+                     <property name="border_width">10</property>
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">minutes</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</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">3</property>
-                     <property name="right_attach">4</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">0</property>
 
-                 <child>
-                   <widget class="GtkLabel" id="cycle_mlabel">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">minutes</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</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">3</property>
-                     <property name="right_attach">4</property>
-                     <property name="top_attach">1</property>
-                     <property name="bottom_attach">2</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
+                     <child>
+                       <widget class="GtkHBox" id="mode_hbox">
+                         <property name="visible">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
 
-                 <child>
-                   <widget class="GtkLabel" id="lock_mlabel">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">minutes</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</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">3</property>
-                     <property name="right_attach">4</property>
-                     <property name="top_attach">2</property>
-                     <property name="bottom_attach">3</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
+                         <child>
+                           <widget class="GtkLabel" id="mode_label">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">_Mode:</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">mode_menu</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>
+                             <accessibility>
+                               <atkrelation target="mode_menu_popup" type="label-for"/>
+                             </accessibility>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
 
-                 <child>
-                   <widget class="GtkSpinButton" id="lock_spinbutton">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">How long before the monitor goes completely black.</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">15</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">True</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">True</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">0 0 720 1 15 15</property>
-                     <signal name="activate" handler="pref_changed_cb"/>
-                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                     <signal name="value_changed" handler="pref_changed_cb"/>
-                   </widget>
-                   <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="y_padding">10</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
+                         <child>
+                           <widget class="GtkOptionMenu" id="mode_menu">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="history">0</property>
+                             <accessibility>
+                               <atkrelation target="mode_label" type="labelled-by"/>
+                             </accessibility>
 
-                 <child>
-                   <widget class="GtkSpinButton" id="cycle_spinbutton">
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">How long before the monitor goes completely black.</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">15</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">True</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">True</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">1 1 720 1 15 15</property>
-                     <signal name="activate" handler="pref_changed_cb"/>
-                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                     <signal name="value_changed" handler="pref_changed_cb"/>
-                   </widget>
-                   <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"></property>
-                   </packing>
-                 </child>
-               </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">fill</property>
-               </packing>
-             </child>
+                             <child internal-child="menu">
+                               <widget class="GtkMenu" id="mode_menu_popup">
+                                 <property name="visible">True</property>
 
-             <child>
-               <widget class="GtkHButtonBox" id="demo_manual_hbbox">
-                 <property name="visible">True</property>
-                 <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
-                 <property name="spacing">30</property>
+                                 <child>
+                                   <widget class="GtkMenuItem" id="disable_menuitem">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">Never blank the screen or power down the monitor.</property>
+                                     <property name="label" translatable="yes">_Disable Screen Saver</property>
+                                     <property name="use_underline">True</property>
+                                   </widget>
+                                 </child>
 
-                 <child>
-                   <widget class="GtkButton" id="demo">
-                     <property name="visible">True</property>
-                     <property name="can_default">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Preview</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <signal name="clicked" handler="run_this_cb"/>
-                   </widget>
-                 </child>
+                                 <child>
+                                   <widget class="GtkMenuItem" id="blank_menuitem">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">When idle or locked, blacken the screen only.</property>
+                                     <property name="label" translatable="yes">_Blank Screen Only</property>
+                                     <property name="use_underline">True</property>
+                                   </widget>
+                                 </child>
 
-                 <child>
-                   <widget class="GtkButton" id="settings">
-                     <property name="visible">True</property>
-                     <property name="can_default">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Settings...</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <signal name="clicked" handler="settings_cb"/>
-                   </widget>
-                 </child>
-               </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="x_options">fill</property>
-                 <property name="y_options">fill</property>
-               </packing>
-             </child>
+                                 <child>
+                                   <widget class="GtkMenuItem" id="one_menuitem">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">When idle or locked, run the display mode selected below.</property>
+                                     <property name="label" translatable="yes">_Only One Screen Saver</property>
+                                     <property name="use_underline">True</property>
+                                   </widget>
+                                 </child>
 
-             <child>
-               <widget class="GtkVBox" id="list_vbox">
-                 <property name="border_width">10</property>
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
+                                 <child>
+                                   <widget class="GtkMenuItem" id="random_menuitem">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">When idle or locked, choose a random display mode from among the checked items in the list below.</property>
+                                     <property name="label" translatable="yes">_Random Screen Saver</property>
+                                     <property name="use_underline">True</property>
+                                   </widget>
+                                 </child>
 
-                 <child>
-                   <widget class="GtkHBox" id="mode_hbox">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
+                                 <child>
+                                   <widget class="GtkMenuItem" id="random_same_menuitem">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">When idle or locked, choose a random display mode from among the checked items in the list below.  Run that same mode on each monitor.</property>
+                                     <property name="label" translatable="yes">_Same Random Savers</property>
+                                     <property name="use_underline">True</property>
+                                   </widget>
+                                 </child>
+                               </widget>
+                             </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">4</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
+                           </packing>
+                         </child>
+                       </widget>
+                       <packing>
+                         <property name="padding">10</property>
+                         <property name="expand">False</property>
+                         <property name="fill">True</property>
+                       </packing>
+                     </child>
 
                      <child>
-                       <widget class="GtkLabel" id="mode_label">
+                       <widget class="GtkScrolledWindow" id="scroller">
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">_Mode:</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">mode_menu</property>
+                         <property name="can_focus">True</property>
+                         <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                         <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                         <property name="shadow_type">GTK_SHADOW_IN</property>
+                         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                         <child>
+                           <widget class="GtkTreeView" id="list">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="headers_visible">False</property>
+                             <property name="rules_hint">True</property>
+                             <property name="reorderable">False</property>
+                             <property name="enable_search">True</property>
+                             <property name="fixed_height_mode">False</property>
+                             <property name="hover_selection">False</property>
+                             <property name="hover_expand">False</property>
+                           </widget>
+                         </child>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkOptionMenu" id="mode_menu">
+                       <widget class="GtkHBox" id="centering_hbox">
                          <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="history">0</property>
+                         <property name="homogeneous">True</property>
+                         <property name="spacing">0</property>
 
-                         <child internal-child="menu">
-                           <widget class="GtkMenu" id="convertwidget1">
+                         <child>
+                           <widget class="GtkHBox" id="next_prev_hbox">
                              <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
 
                              <child>
-                               <widget class="GtkMenuItem" id="convertwidget2">
+                               <widget class="GtkButton" id="next">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Disable Screen Saver</property>
-                                 <property name="use_underline">True</property>
-                               </widget>
-                             </child>
+                                 <property name="tooltip" translatable="yes">Run the next screen saver in the list in full-screen mode (click the mouse to return.)</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
+                                 <signal name="clicked" handler="run_next_cb"/>
 
-                             <child>
-                               <widget class="GtkMenuItem" id="convertwidget3">
-                                 <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Blank Screen Only</property>
-                                 <property name="use_underline">True</property>
+                                 <child>
+                                   <widget class="GtkArrow" id="arrow1">
+                                     <property name="visible">True</property>
+                                     <property name="arrow_type">GTK_ARROW_DOWN</property>
+                                     <property name="shadow_type">GTK_SHADOW_OUT</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="GtkMenuItem" id="convertwidget4">
+                               <widget class="GtkButton" id="prev">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Only One Screen Saver</property>
-                                 <property name="use_underline">True</property>
-                               </widget>
-                             </child>
+                                 <property name="tooltip" translatable="yes">Run the previous screen saver in the list in full-screen mode (click the mouse to return.)</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
+                                 <signal name="clicked" handler="run_prev_cb"/>
 
-                             <child>
-                               <widget class="GtkMenuItem" id="convertwidget5">
-                                 <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Random Screen Saver</property>
-                                 <property name="use_underline">True</property>
+                                 <child>
+                                   <widget class="GtkArrow" id="arrow2">
+                                     <property name="visible">True</property>
+                                     <property name="arrow_type">GTK_ARROW_UP</property>
+                                     <property name="shadow_type">GTK_SHADOW_OUT</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>
                        </widget>
                        <packing>
-                         <property name="padding">4</property>
-                         <property name="expand">True</property>
+                         <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>
                    </widget>
                    <packing>
-                     <property name="padding">10</property>
-                     <property name="expand">False</property>
-                     <property name="fill">True</property>
+                     <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>
                    </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkScrolledWindow" id="scroller">
+                   <widget class="GtkFrame" id="preview_frame">
                      <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_ALWAYS</property>
-                     <property name="shadow_type">GTK_SHADOW_IN</property>
-                     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                     <property name="label_xalign">0</property>
+                     <property name="label_yalign">0.5</property>
+                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                     <accessibility>
+                       <atkrelation target="label1" type="labelled-by"/>
+                     </accessibility>
 
                      <child>
-                       <widget class="GtkTreeView" id="list">
+                       <widget class="GtkNotebook" id="preview_notebook">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="headers_visible">False</property>
-                         <property name="rules_hint">True</property>
-                         <property name="reorderable">False</property>
-                         <property name="enable_search">True</property>
-                       </widget>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkHBox" id="centering_hbox">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">True</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkHBox" id="next_prev_hbox">
-                         <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
+                         <property name="show_tabs">True</property>
+                         <property name="show_border">False</property>
+                         <property name="tab_pos">GTK_POS_BOTTOM</property>
+                         <property name="scrollable">False</property>
+                         <property name="enable_popup">False</property>
 
                          <child>
-                           <widget class="GtkButton" id="next">
+                           <widget class="GtkAspectFrame" id="preview_aspectframe">
+                             <property name="border_width">8</property>
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <signal name="clicked" handler="run_next_cb"/>
+                             <property name="label_xalign">0</property>
+                             <property name="label_yalign">0.5</property>
+                             <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="ratio">1.33000004292</property>
+                             <property name="obey_child">False</property>
 
                              <child>
-                               <widget class="GtkArrow" id="arrow1">
+                               <widget class="GtkDrawingArea" id="preview">
                                  <property name="visible">True</property>
-                                 <property name="arrow_type">GTK_ARROW_DOWN</property>
-                                 <property name="shadow_type">GTK_SHADOW_OUT</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>
+                             <property name="tab_expand">False</property>
+                             <property name="tab_fill">True</property>
                            </packing>
                          </child>
 
                          <child>
-                           <widget class="GtkButton" id="prev">
+                           <widget class="GtkLabel" id="preview_tab">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <signal name="clicked" handler="run_prev_cb"/>
-
-                             <child>
-                               <widget class="GtkArrow" id="arrow2">
-                                 <property name="visible">True</property>
-                                 <property name="arrow_type">GTK_ARROW_UP</property>
-                                 <property name="shadow_type">GTK_SHADOW_OUT</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>
+                             <property name="label" translatable="yes">preview</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>
+                             <property name="type">tab</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">True</property>
-                     <property name="pack_type">GTK_PACK_END</property>
-                   </packing>
-                 </child>
-               </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>
-               </packing>
-             </child>
 
-             <child>
-               <widget class="GtkFrame" id="preview_frame">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Description</property>
-                 <property name="label_xalign">0</property>
-                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                         <child>
+                           <widget class="GtkLabel" id="no_preview_label">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">No Preview
+Available</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</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">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="tab_expand">False</property>
+                             <property name="tab_fill">True</property>
+                           </packing>
+                         </child>
 
-                 <child>
-                   <widget class="GtkNotebook" id="preview_notebook">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="show_tabs">True</property>
-                     <property name="show_border">False</property>
-                     <property name="tab_pos">GTK_POS_BOTTOM</property>
-                     <property name="scrollable">False</property>
-                     <property name="tab_hborder">2</property>
-                     <property name="tab_vborder">2</property>
-                     <property name="enable_popup">False</property>
+                         <child>
+                           <widget class="GtkLabel" id="no_preview_tab">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">no preview</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
+                           </widget>
+                           <packing>
+                             <property name="type">tab</property>
+                           </packing>
+                         </child>
 
-                     <child>
-                       <widget class="GtkAspectFrame" id="preview_aspectframe">
-                         <property name="border_width">8</property>
-                         <property name="visible">True</property>
-                         <property name="label_xalign">0</property>
-                         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="ratio">1.33</property>
-                         <property name="obey_child">False</property>
+                         <child>
+                           <widget class="GtkLabel" id="not_installed_label">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Not
+Installed</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</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">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="tab_expand">False</property>
+                             <property name="tab_fill">True</property>
+                           </packing>
+                         </child>
 
                          <child>
-                           <widget class="GtkDrawingArea" id="preview">
+                           <widget class="GtkLabel" id="not_installed_tab">
                              <property name="visible">True</property>
-                             <accessibility>
-                               <atkproperty name="AtkObject::accessible_description" translatable="yes">Preview of screen saver</atkproperty>
-                             </accessibility>
+                             <property name="label" translatable="yes">not installed</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
                            </widget>
+                           <packing>
+                             <property name="type">tab</property>
+                           </packing>
                          </child>
-                       </widget>
-                       <packing>
-                         <property name="tab_expand">False</property>
-                         <property name="tab_fill">True</property>
-                       </packing>
-                     </child>
 
-                     <child>
-                       <widget class="GtkLabel" id="preview_tab">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">preview</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>
-                       </widget>
-                       <packing>
-                         <property name="type">tab</property>
-                       </packing>
-                     </child>
+                         <child>
+                           <widget class="GtkLabel" id="nothing_label">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Very few (or no) screen savers appear to be available.
 
-                     <child>
-                       <widget class="GtkLabel" id="no_preview_label">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">No Preview
-Available</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>
+This probably means that the &quot;xscreensaver-extras&quot; and
+&quot;xscreensaver-gl-extras&quot; packages are not installed.</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</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">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="tab_expand">False</property>
+                             <property name="tab_fill">True</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkLabel" id="nothing_tab">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">nothing</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
+                           </widget>
+                           <packing>
+                             <property name="type">tab</property>
+                           </packing>
+                         </child>
                        </widget>
-                       <packing>
-                         <property name="tab_expand">False</property>
-                         <property name="tab_fill">True</property>
-                       </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="no_preview_tab">
+                       <widget class="GtkLabel" id="label1">
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">no preview</property>
+                         <property name="label" translatable="yes">Description</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -740,145 +987,95 @@ Available</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>
+                         <accessibility>
+                           <atkrelation target="preview_frame" type="label-for"/>
+                         </accessibility>
                        </widget>
                        <packing>
-                         <property name="type">tab</property>
+                         <property name="type">label_item</property>
                        </packing>
                      </child>
                    </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_padding">6</property>
+                     <property name="x_options">expand|shrink|fill</property>
+                     <property name="y_options">expand|shrink|fill</property>
+                   </packing>
                  </child>
                </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_padding">6</property>
-                 <property name="x_options">expand|shrink|fill</property>
-                 <property name="y_options">expand|shrink|fill</property>
+                 <property name="tab_expand">False</property>
+                 <property name="tab_fill">True</property>
                </packing>
              </child>
-           </widget>
-           <packing>
-             <property name="tab_expand">False</property>
-             <property name="tab_fill">True</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="demo_tab">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_Display Modes</property>
-             <property name="use_underline">True</property>
-             <property name="use_markup">False</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">0</property>
-             <property name="ypad">0</property>
-           </widget>
-           <packing>
-             <property name="type">tab</property>
-           </packing>
-         </child>
 
-         <child>
-           <widget class="GtkTable" id="options_table">
-             <property name="visible">True</property>
-             <property name="n_rows">2</property>
-             <property name="n_columns">2</property>
-             <property name="homogeneous">True</property>
-             <property name="row_spacing">0</property>
-             <property name="column_spacing">0</property>
+             <child>
+               <widget class="GtkLabel" id="demo_tab">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">_Display Modes</property>
+                 <property name="use_underline">True</property>
+                 <property name="use_markup">False</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">0</property>
+                 <property name="ypad">0</property>
+                 <property name="mnemonic_widget">notebook</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="type">tab</property>
+               </packing>
+             </child>
 
              <child>
-               <widget class="GtkFrame" id="grab_frame">
-                 <property name="border_width">10</property>
+               <widget class="GtkTable" id="options_table">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Image Manipulation</property>
-                 <property name="label_xalign">0</property>
-                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                 <property name="n_rows">2</property>
+                 <property name="n_columns">2</property>
+                 <property name="homogeneous">True</property>
+                 <property name="row_spacing">0</property>
+                 <property name="column_spacing">0</property>
 
                  <child>
-                   <widget class="GtkHBox" id="grab_hbox">
-                     <property name="border_width">8</property>
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">8</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image2">
-                         <property name="visible">True</property>
-                         <property name="pixbuf">screensaver-snap.xpm</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0</property>
-                         <property name="xpad">4</property>
-                         <property name="ypad">8</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
+                   <widget class="GtkFrame" id="grab_frame">
+                     <property name="border_width">10</property>
+                     <property name="visible">True</property>
+                     <property name="label_xalign">0</property>
+                     <property name="label_yalign">0.5</property>
+                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                     <accessibility>
+                       <atkrelation target="label2" type="labelled-by"/>
+                     </accessibility>
 
                      <child>
-                       <widget class="GtkVBox" id="grab_vbox">
+                       <widget class="GtkHBox" id="grab_hbox">
+                         <property name="border_width">8</property>
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
-
-                         <child>
-                           <widget class="GtkCheckButton" id="grab_desk_button">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Grab Desktop _Images</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkCheckButton" id="grab_video_button">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Grab _Video Frames</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
+                         <property name="spacing">8</property>
 
                          <child>
-                           <widget class="GtkCheckButton" id="grab_image_button">
+                           <widget class="GtkImage" id="image2">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Choose _Random Image:</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
+                             <property name="pixbuf">screensaver-snap.png</property>
+                             <property name="xalign">0</property>
+                             <property name="yalign">0</property>
+                             <property name="xpad">4</property>
+                             <property name="ypad">8</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -888,24 +1085,24 @@ Available</property>
                          </child>
 
                          <child>
-                           <widget class="GtkHBox" id="image_hbox">
+                           <widget class="GtkVBox" id="grab_vbox">
                              <property name="visible">True</property>
                              <property name="homogeneous">False</property>
                              <property name="spacing">0</property>
 
                              <child>
-                               <widget class="GtkLabel" id="grab_dummy">
+                               <widget class="GtkCheckButton" id="grab_desk_button">
                                  <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">8</property>
-                                 <property name="ypad">0</property>
+                                 <property name="tooltip" translatable="yes">Whether the image-manipulating modes should be allowed to operate on an image of your desktop.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Grab Desktop _Images</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>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -915,34 +1112,43 @@ Available</property>
                              </child>
 
                              <child>
-                               <widget class="GtkEntry" id="image_text">
+                               <widget class="GtkCheckButton" id="grab_video_button">
                                  <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Whether the image-manipulating modes should operate on images captured from the system's video input (if there is one.)</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" translatable="yes">*</property>
-                                 <property name="activates_default">False</property>
-                                 <signal name="activate" handler="pref_changed_cb"/>
-                                 <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                                 <property name="label" translatable="yes">Grab _Video Frames</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>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
-                                 <property name="expand">True</property>
-                                 <property name="fill">True</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkButton" id="image_browse_button">
+                               <widget class="GtkCheckButton" id="grab_image_button">
                                  <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Whether the image-manipulating modes should load image files.</property>
                                  <property name="can_focus">True</property>
-                                 <property name="label" translatable="yes">_Browse</property>
+                                 <property name="label" translatable="yes">Choose _Random Image:</property>
                                  <property name="use_underline">True</property>
                                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <signal name="clicked" handler="browse_image_dir_cb"/>
+                                 <property name="focus_on_click">True</property>
+                                 <property name="active">False</property>
+                                 <property name="inconsistent">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <accessibility>
+                                   <atkrelation target="image_text" type="controller-for"/>
+                                   <atkrelation target="image_browse_button" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -950,190 +1156,182 @@ Available</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>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </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>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkFrame" id="diag_frame">
-                 <property name="border_width">10</property>
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Diagnostics</property>
-                 <property name="label_xalign">0</property>
-                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="diag_hbox">
-                     <property name="border_width">8</property>
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">8</property>
 
-                     <child>
-                       <widget class="GtkImage" id="diag_logo">
-                         <property name="visible">True</property>
-                         <property name="pixbuf">screensaver-diagnostic.xpm</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="GtkHBox" id="image_hbox">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">0</property>
 
-                     <child>
-                       <widget class="GtkVBox" id="diag_vbox">
-                         <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
+                                 <child>
+                                   <widget class="GtkLabel" id="grab_dummy">
+                                     <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">8</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="GtkCheckButton" id="verbose_button">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">_Verbose Dialognostics</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
+                                 <child>
+                                   <widget class="GtkEntry" id="image_text">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">The local directory, RSS feed or Atom feed from which images will be randomly chosen.</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>
+                                     <accessibility>
+                                       <atkrelation target="grab_image_button" type="labelled-by"/>
+                                       <atkrelation target="grab_image_button" type="controlled-by"/>
+                                     </accessibility>
+                                     <signal name="activate" handler="pref_changed_cb"/>
+                                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">2</property>
+                                     <property name="expand">True</property>
+                                     <property name="fill">True</property>
+                                   </packing>
+                                 </child>
 
-                         <child>
-                           <widget class="GtkCheckButton" id="capture_button">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Display Subprocess _Errors</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
+                                 <child>
+                                   <widget class="GtkButton" id="image_browse_button">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="label" translatable="yes">_Browse</property>
+                                     <property name="use_underline">True</property>
+                                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                                     <property name="focus_on_click">True</property>
+                                     <signal name="clicked" handler="browse_image_dir_cb"/>
+                                   </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="GtkCheckButton" id="splash_button">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Display _Splash Screen at Startup</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
+                             <child>
+                               <widget class="GtkLabel" id="label8">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">Local directory, or RSS feed URL.</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</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">20</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>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
                            </packing>
                          </child>
                        </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
                      </child>
-                   </widget>
-                 </child>
-               </widget>
-               <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>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkFrame" id="dpms_frame">
-                 <property name="border_width">10</property>
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Display Power Management</property>
-                 <property name="label_xalign">0</property>
-                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="dpms_hbox">
-                     <property name="border_width">8</property>
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">8</property>
 
                      <child>
-                       <widget class="GtkImage" id="dpms_logo">
+                       <widget class="GtkLabel" id="label2">
                          <property name="visible">True</property>
-                         <property name="pixbuf">screensaver-power.xpm</property>
+                         <property name="label" translatable="yes">Image Manipulation</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</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>
+                         <accessibility>
+                           <atkrelation target="grab_frame" type="label-for"/>
+                         </accessibility>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
+                         <property name="type">label_item</property>
                        </packing>
                      </child>
+                   </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>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkFrame" id="diag_frame">
+                     <property name="border_width">10</property>
+                     <property name="visible">True</property>
+                     <property name="label_xalign">0</property>
+                     <property name="label_yalign">0.5</property>
+                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                     <accessibility>
+                       <atkrelation target="label3" type="labelled-by"/>
+                     </accessibility>
 
                      <child>
-                       <widget class="GtkVBox" id="vbox6">
+                       <widget class="GtkHBox" id="diag_hbox">
+                         <property name="border_width">8</property>
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
+                         <property name="spacing">8</property>
 
                          <child>
-                           <widget class="GtkCheckButton" id="dpms_button">
+                           <widget class="GtkImage" id="diag_logo">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">_Power Management Enabled</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">True</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
+                             <property name="pixbuf">screensaver-diagnostic.png</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>
@@ -1143,105 +1341,147 @@ Available</property>
                          </child>
 
                          <child>
-                           <widget class="GtkTable" id="dpms_table">
+                           <widget class="GtkTable" id="text_table">
                              <property name="visible">True</property>
-                             <property name="n_rows">3</property>
+                             <property name="n_rows">5</property>
                              <property name="n_columns">3</property>
                              <property name="homogeneous">False</property>
                              <property name="row_spacing">2</property>
-                             <property name="column_spacing">4</property>
+                             <property name="column_spacing">2</property>
+
+                             <child>
+                               <widget class="GtkRadioButton" id="text_radio">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the text typed here.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Text</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>
+                                 <accessibility>
+                                   <atkrelation target="text_entry" type="controller-for"/>
+                                   <atkrelation target="text_entry" type="label-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:44 GMT"/>
+                               </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="GtkLabel" id="dpms_standby_label">
+                               <widget class="GtkRadioButton" id="text_file_radio">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Stand_by After</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this file.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Text _file</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">10</property>
-                                 <property name="ypad">0</property>
-                                 <property name="mnemonic_widget">dpms_standby_spinbutton</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">text_radio</property>
+                                 <accessibility>
+                                   <atkrelation target="text_file_entry" type="label-for"/>
+                                   <atkrelation target="text_file_entry" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:55 GMT"/>
                                </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="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="GtkLabel" id="dpms_suspend_label">
+                               <widget class="GtkRadioButton" id="text_program_radio">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Sus_pend After</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the output of this program.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Program</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">10</property>
-                                 <property name="ypad">0</property>
-                                 <property name="mnemonic_widget">dpms_suspend_spinbutton</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">text_radio</property>
+                                 <accessibility>
+                                   <atkrelation target="text_program_entry" type="label-for"/>
+                                   <atkrelation target="text_program_entry" type="controller-for"/>
+                                   <atkrelation target="text_program_browse" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:07 GMT"/>
                                </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="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="GtkLabel" id="dpms_off_label">
+                               <widget class="GtkRadioButton" id="text_url_radio">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">_Off After</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this URL (HTML or RSS).</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_URL</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">10</property>
-                                 <property name="ypad">0</property>
-                                 <property name="mnemonic_widget">dpms_off_spinbutton</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">text_radio</property>
+                                 <accessibility>
+                                   <atkrelation target="text_url_entry" type="label-for"/>
+                                   <atkrelation target="text_url_entry" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:17 GMT"/>
                                </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="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="GtkLabel" id="dpms_standby_mlabel">
+                               <widget class="GtkRadioButton" id="text_host_radio">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">minutes</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</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the local host name, date, and time.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Host Name and Time</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>
+                                 <property name="group">text_radio</property>
+                                 <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:32 GMT"/>
                                </widget>
                                <packing>
-                                 <property name="left_attach">2</property>
+                                 <property name="left_attach">0</property>
                                  <property name="right_attach">3</property>
                                  <property name="top_attach">0</property>
                                  <property name="bottom_attach">1</property>
@@ -1251,42 +1491,44 @@ Available</property>
                              </child>
 
                              <child>
-                               <widget class="GtkLabel" id="dpms_suspend_mlabel">
+                               <widget class="GtkEntry" id="text_url_entry">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">minutes</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</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this URL (HTML or RSS).</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>
+                                 <accessibility>
+                                   <atkrelation target="text_url_radio" type="controlled-by"/>
+                                 </accessibility>
+                                 <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:10 GMT"/>
+                                 <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:26 GMT"/>
                                </widget>
                                <packing>
-                                 <property name="left_attach">2</property>
+                                 <property name="left_attach">1</property>
                                  <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
-                                 <property name="bottom_attach">2</property>
-                                 <property name="x_options">fill</property>
+                                 <property name="top_attach">4</property>
+                                 <property name="bottom_attach">5</property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkLabel" id="dpms_off_mlabel">
+                               <widget class="GtkButton" id="text_file_browse">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">minutes</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</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Browse</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
+                                 <accessibility>
+                                   <atkrelation target="text_file_radio" type="controlled-by"/>
+                                 </accessibility>
+                                 <signal name="clicked" handler="browse_text_file_cb" last_modification_time="Sun, 20 Mar 2005 01:24:38 GMT"/>
                                </widget>
                                <packing>
                                  <property name="left_attach">2</property>
@@ -1299,76 +1541,108 @@ Available</property>
                              </child>
 
                              <child>
-                               <widget class="GtkSpinButton" id="dpms_off_spinbutton">
+                               <widget class="GtkEntry" id="text_entry">
                                  <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the text typed here.</property>
                                  <property name="can_focus">True</property>
-                                 <property name="climb_rate">15</property>
-                                 <property name="digits">0</property>
-                                 <property name="numeric">True</property>
-                                 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                 <property name="snap_to_ticks">True</property>
-                                 <property name="wrap">False</property>
-                                 <property name="adjustment">0 0 1440 1 15 15</property>
-                                 <signal name="activate" handler="pref_changed_cb"/>
-                                 <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                                 <signal name="value_changed" handler="pref_changed_cb"/>
+                                 <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>
+                                 <accessibility>
+                                   <atkrelation target="text_program_radio" type="labelled-by"/>
+                                   <atkrelation target="text_program_radio" type="controlled-by"/>
+                                 </accessibility>
+                                 <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:42 GMT"/>
+                                 <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:43 GMT"/>
                                </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"></property>
+                                 <property name="right_attach">3</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="dpms_suspend_spinbutton">
+                               <widget class="GtkEntry" id="text_program_entry">
                                  <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the output of this program.</property>
                                  <property name="can_focus">True</property>
-                                 <property name="climb_rate">15</property>
-                                 <property name="digits">0</property>
-                                 <property name="numeric">True</property>
-                                 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                 <property name="snap_to_ticks">True</property>
-                                 <property name="wrap">False</property>
-                                 <property name="adjustment">0 0 1440 1 15 15</property>
-                                 <signal name="activate" handler="pref_changed_cb"/>
-                                 <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                                 <signal name="value_changed" handler="pref_changed_cb"/>
+                                 <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>
+                                 <accessibility>
+                                   <atkrelation target="text_program_radio" type="labelled-by"/>
+                                   <atkrelation target="text_program_radio" type="controlled-by"/>
+                                 </accessibility>
+                                 <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:02 GMT"/>
+                                 <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:15 GMT"/>
                                </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="x_options"></property>
+                                 <property name="top_attach">3</property>
+                                 <property name="bottom_attach">4</property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkSpinButton" id="dpms_standby_spinbutton">
+                               <widget class="GtkButton" id="text_program_browse">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
-                                 <property name="climb_rate">15</property>
-                                 <property name="digits">0</property>
-                                 <property name="numeric">True</property>
-                                 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                 <property name="snap_to_ticks">True</property>
-                                 <property name="wrap">False</property>
-                                 <property name="adjustment">0 0 1440 1 15 15</property>
-                                 <signal name="activate" handler="pref_changed_cb"/>
-                                 <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                                 <signal name="value_changed" handler="pref_changed_cb"/>
+                                 <property name="label" translatable="yes">_Browse</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
+                                 <accessibility>
+                                   <atkrelation target="text_program_radio" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="clicked" handler="browse_text_program_cb" last_modification_time="Sun, 20 Mar 2005 01:24:51 GMT"/>
+                               </widget>
+                               <packing>
+                                 <property name="left_attach">2</property>
+                                 <property name="right_attach">3</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="GtkEntry" id="text_file_entry">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this file.</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>
+                                 <accessibility>
+                                   <atkrelation target="text_file_radio" type="labelled-by"/>
+                                   <atkrelation target="text_file_radio" type="controlled-by"/>
+                                 </accessibility>
+                                 <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:53 GMT"/>
+                                 <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:55 GMT"/>
                                </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="x_options"></property>
+                                 <property name="top_attach">2</property>
+                                 <property name="bottom_attach">3</property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
@@ -1380,72 +1654,66 @@ Available</property>
                            </packing>
                          </child>
                        </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
-                       </packing>
                      </child>
-                   </widget>
-                 </child>
-               </widget>
-               <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>
-               <widget class="GtkFrame" id="cmap_frame">
-                 <property name="border_width">10</property>
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Colormaps</property>
-                 <property name="label_xalign">0</property>
-                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="cmap_hbox">
-                     <property name="border_width">8</property>
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">8</property>
 
                      <child>
-                       <widget class="GtkImage" id="image5">
+                       <widget class="GtkLabel" id="label3">
                          <property name="visible">True</property>
-                         <property name="pixbuf">screensaver-colorselector.xpm</property>
+                         <property name="label" translatable="yes">Text Manipulation</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</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>
+                         <accessibility>
+                           <atkrelation target="diag_frame" type="label-for"/>
+                         </accessibility>
                        </widget>
                        <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
+                         <property name="type">label_item</property>
                        </packing>
                      </child>
+                   </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>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkFrame" id="dpms_frame">
+                     <property name="border_width">10</property>
+                     <property name="visible">True</property>
+                     <property name="label_xalign">0</property>
+                     <property name="label_yalign">0.5</property>
+                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
                      <child>
-                       <widget class="GtkVBox" id="vbox7">
+                       <widget class="GtkHBox" id="dpms_hbox">
+                         <property name="border_width">8</property>
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
-                         <property name="spacing">0</property>
+                         <property name="spacing">8</property>
 
                          <child>
-                           <widget class="GtkCheckButton" id="install_button">
+                           <widget class="GtkImage" id="dpms_logo">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Install _Colormap</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
+                             <property name="pixbuf">screensaver-power.png</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>
@@ -1455,46 +1723,439 @@ Available</property>
                          </child>
 
                          <child>
-                           <widget class="GtkHSeparator" id="cmap_hr">
+                           <widget class="GtkVBox" id="vbox6">
                              <property name="visible">True</property>
-                           </widget>
-                           <packing>
-                             <property name="padding">4</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
-                           </packing>
-                         </child>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
+
+                             <child>
+                               <widget class="GtkCheckButton" id="dpms_button">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Whether the monitor should be powered down after a while.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Power Management Enabled</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>
+                                 <accessibility>
+                                   <atkrelation target="dpms_suspend_spinbutton" type="controller-for"/>
+                                   <atkrelation target="dpms_standby_spinbutton" type="controller-for"/>
+                                   <atkrelation target="dpms_off_spinbutton" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkTable" id="dpms_table">
+                                 <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">2</property>
+                                 <property name="column_spacing">4</property>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="dpms_standby_label">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Stand_by After</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">10</property>
+                                     <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">dpms_standby_spinbutton</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>
+                                     <accessibility>
+                                       <atkrelation target="dpms_standby_spinbutton" type="label-for"/>
+                                       <atkrelation target="dpms_standby_spinbutton" type="flows-to"/>
+                                     </accessibility>
+                                   </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="dpms_suspend_label">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Sus_pend After</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">10</property>
+                                     <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">dpms_suspend_spinbutton</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>
+                                     <accessibility>
+                                       <atkrelation target="dpms_suspend_spinbutton" type="label-for"/>
+                                       <atkrelation target="dpms_suspend_spinbutton" type="flows-to"/>
+                                     </accessibility>
+                                   </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="GtkLabel" id="dpms_off_label">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">_Off After</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">10</property>
+                                     <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">dpms_off_spinbutton</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>
+                                     <accessibility>
+                                       <atkrelation target="dpms_off_spinbutton" type="label-for"/>
+                                       <atkrelation target="dpms_off_spinbutton" type="flows-to"/>
+                                     </accessibility>
+                                   </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>
+                                     <property name="y_options"></property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="dpms_standby_mlabel">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">minutes</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</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>
+                                     <accessibility>
+                                       <atkrelation target="dpms_standby_spinbutton" type="label-for"/>
+                                       <atkrelation target="dpms_standby_spinbutton" type="flows-from"/>
+                                     </accessibility>
+                                   </widget>
+                                   <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"></property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="dpms_suspend_mlabel">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">minutes</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</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>
+                                     <accessibility>
+                                       <atkrelation target="dpms_suspend_spinbutton" type="label-for"/>
+                                       <atkrelation target="dpms_suspend_spinbutton" type="flows-from"/>
+                                     </accessibility>
+                                   </widget>
+                                   <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"></property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="dpms_off_mlabel">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">minutes</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</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>
+                                     <accessibility>
+                                       <atkrelation target="dpms_off_spinbutton" type="label-for"/>
+                                       <atkrelation target="dpms_off_spinbutton" type="flows-from"/>
+                                     </accessibility>
+                                   </widget>
+                                   <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"></property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkSpinButton" id="dpms_off_spinbutton">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">How long until the monitor powers down.</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="climb_rate">15</property>
+                                     <property name="digits">0</property>
+                                     <property name="numeric">True</property>
+                                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property name="snap_to_ticks">True</property>
+                                     <property name="wrap">False</property>
+                                     <property name="adjustment">0 0 1440 1 15 0</property>
+                                     <accessibility>
+                                       <atkrelation target="dpms_button" type="controlled-by"/>
+                                       <atkrelation target="dpms_off_label" type="labelled-by"/>
+                                       <atkrelation target="dpms_off_mlabel" type="labelled-by"/>
+                                       <atkrelation target="dpms_off_label" type="flows-from"/>
+                                       <atkrelation target="dpms_off_mlabel" type="flows-to"/>
+                                     </accessibility>
+                                     <signal name="activate" handler="pref_changed_cb"/>
+                                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                                     <signal name="value_changed" handler="pref_changed_cb"/>
+                                   </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"></property>
+                                     <property name="y_options"></property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkSpinButton" id="dpms_suspend_spinbutton">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">How long until the monitor goes into power-saving mode.</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="climb_rate">15</property>
+                                     <property name="digits">0</property>
+                                     <property name="numeric">True</property>
+                                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property name="snap_to_ticks">True</property>
+                                     <property name="wrap">False</property>
+                                     <property name="adjustment">0 0 1440 1 15 0</property>
+                                     <accessibility>
+                                       <atkrelation target="dpms_button" type="controlled-by"/>
+                                       <atkrelation target="dpms_suspend_label" type="labelled-by"/>
+                                       <atkrelation target="dpms_suspend_mlabel" type="labelled-by"/>
+                                       <atkrelation target="dpms_suspend_label" type="flows-from"/>
+                                       <atkrelation target="dpms_suspend_mlabel" type="flows-to"/>
+                                     </accessibility>
+                                     <signal name="activate" handler="pref_changed_cb"/>
+                                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                                     <signal name="value_changed" handler="pref_changed_cb"/>
+                                   </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="x_options"></property>
+                                     <property name="y_options"></property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkSpinButton" id="dpms_standby_spinbutton">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">How long until the monitor goes completely black.</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="climb_rate">15</property>
+                                     <property name="digits">0</property>
+                                     <property name="numeric">True</property>
+                                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property name="snap_to_ticks">True</property>
+                                     <property name="wrap">False</property>
+                                     <property name="adjustment">0 0 1440 1 15 0</property>
+                                     <accessibility>
+                                       <atkrelation target="dpms_button" type="controlled-by"/>
+                                       <atkrelation target="dpms_standby_label" type="labelled-by"/>
+                                       <atkrelation target="dpms_standby_mlabel" type="labelled-by"/>
+                                       <atkrelation target="dpms_standby_label" type="flows-from"/>
+                                       <atkrelation target="dpms_standby_mlabel" type="flows-to"/>
+                                     </accessibility>
+                                     <signal name="activate" handler="pref_changed_cb"/>
+                                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                                     <signal name="value_changed" handler="pref_changed_cb"/>
+                                   </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="x_options"></property>
+                                     <property name="y_options"></property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkCheckButton" id="dpms_quickoff_button">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Whether the monitor should be powered off immediately in "Blank Screen Only" mode, regardless of the above power-management timeouts.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Quick Power-off in Blank Only Mode</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>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
 
-                         <child>
-                           <widget class="GtkCheckButton" id="fade_button">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Fade to Black when _Blanking</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
                            </packing>
                          </child>
+                       </widget>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="label4">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">Display Power Management</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>
+                         <accessibility>
+                           <atkrelation target="dpms_frame" type="label-for"/>
+                         </accessibility>
+                       </widget>
+                       <packing>
+                         <property name="type">label_item</property>
+                       </packing>
+                     </child>
+                   </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">fill</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkFrame" id="cmap_frame">
+                     <property name="border_width">10</property>
+                     <property name="visible">True</property>
+                     <property name="label_xalign">0</property>
+                     <property name="label_yalign">0.5</property>
+                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                     <accessibility>
+                       <atkrelation target="label5" type="labelled-by"/>
+                     </accessibility>
+
+                     <child>
+                       <widget class="GtkHBox" id="cmap_hbox">
+                         <property name="border_width">8</property>
+                         <property name="visible">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">8</property>
 
                          <child>
-                           <widget class="GtkCheckButton" id="unfade_button">
+                           <widget class="GtkImage" id="image5">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">Fade from Black When _Unblanking</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="pref_changed_cb"/>
+                             <property name="pixbuf">screensaver-colorselector.png</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>
@@ -1504,24 +2165,27 @@ Available</property>
                          </child>
 
                          <child>
-                           <widget class="GtkHBox" id="fade_hbox">
+                           <widget class="GtkVBox" id="vbox7">
                              <property name="visible">True</property>
                              <property name="homogeneous">False</property>
                              <property name="spacing">0</property>
 
                              <child>
-                               <widget class="GtkLabel" id="fade_dummy">
+                               <widget class="GtkCheckButton" id="fade_button">
                                  <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">3</property>
-                                 <property name="ypad">0</property>
+                                 <property name="tooltip" translatable="yes">Whether the screen should slowly fade to black when the screen saver activates.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Fade to Black when _Blanking</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>
+                                 <accessibility>
+                                   <atkrelation target="fade_spinbutton" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -1531,62 +2195,181 @@ Available</property>
                              </child>
 
                              <child>
-                               <widget class="GtkLabel" id="fade_label">
+                               <widget class="GtkCheckButton" id="unfade_button">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">F_ade Duration</property>
+                                 <property name="tooltip" translatable="yes">Whether the screen should slowly fade in from black when the screen saver deactivates.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Fade from Black When _Unblanking</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">fade_spinbutton</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>
+                                 <accessibility>
+                                   <atkrelation target="fade_spinbutton" type="controller-for"/>
+                                 </accessibility>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
                                </widget>
                                <packing>
-                                 <property name="padding">10</property>
+                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkSpinButton" id="fade_spinbutton">
+                               <widget class="GtkHBox" id="fade_hbox">
                                  <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">True</property>
-                                 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                 <property name="snap_to_ticks">True</property>
-                                 <property name="wrap">False</property>
-                                 <property name="adjustment">0 0 10 1 1 1</property>
-                                 <signal name="activate" handler="pref_changed_cb"/>
-                                 <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-                                 <signal name="value_changed" handler="pref_changed_cb"/>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">0</property>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="fade_dummy">
+                                     <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">3</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="GtkLabel" id="fade_label">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">F_ade Duration</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">fade_spinbutton</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>
+                                     <accessibility>
+                                       <atkrelation target="fade_spinbutton" type="label-for"/>
+                                       <atkrelation target="fade_spinbutton" type="flows-to"/>
+                                     </accessibility>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">14</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkSpinButton" id="fade_spinbutton">
+                                     <property name="visible">True</property>
+                                     <property name="tooltip" translatable="yes">How long it should take for the screen to fade in and out.</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">True</property>
+                                     <property name="wrap">False</property>
+                                     <property name="adjustment">0 0 10 1 1 0</property>
+                                     <accessibility>
+                                       <atkrelation target="unfade_button" type="controlled-by"/>
+                                       <atkrelation target="fade_button" type="controlled-by"/>
+                                       <atkrelation target="fade_label" type="labelled-by"/>
+                                       <atkrelation target="fade_sec_label" type="labelled-by"/>
+                                       <atkrelation target="fade_label" type="flows-from"/>
+                                       <atkrelation target="fade_sec_label" type="flows-to"/>
+                                     </accessibility>
+                                     <signal name="activate" handler="pref_changed_cb"/>
+                                     <signal name="focus_out_event" handler="pref_changed_event_cb"/>
+                                     <signal name="value_changed" handler="pref_changed_cb"/>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">4</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="fade_sec_label">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">seconds</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</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>
+                                     <accessibility>
+                                       <atkrelation target="fade_spinbutton" type="label-for"/>
+                                       <atkrelation target="fade_spinbutton" type="flows-from"/>
+                                     </accessibility>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">2</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
-                                 <property name="expand">True</property>
-                                 <property name="fill">True</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkLabel" id="fade_sec_label">
+                               <widget class="GtkHSeparator" id="cmap_hr">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">seconds</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</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">8</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkCheckButton" id="install_button">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" translatable="yes">Whether to install a private colormap when running in 8-bit mode on the default Visual.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Install _Colormap</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>
+                                 <signal name="toggled" handler="pref_changed_cb"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -1602,54 +2385,125 @@ Available</property>
                            </packing>
                          </child>
                        </widget>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="label5">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">Fading and Colormaps</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>
+                         <accessibility>
+                           <atkrelation target="cmap_frame" type="label-for"/>
+                         </accessibility>
+                       </widget>
                        <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">True</property>
-                         <property name="fill">True</property>
+                         <property name="type">label_item</property>
                        </packing>
                      </child>
                    </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="x_options">fill</property>
+                     <property name="y_options">fill</property>
+                   </packing>
                  </child>
                </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="x_options">fill</property>
-                 <property name="y_options">fill</property>
+                 <property name="tab_expand">False</property>
+                 <property name="tab_fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkLabel" id="options_tab">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">_Advanced</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">notebook</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="type">tab</property>
                </packing>
              </child>
            </widget>
            <packing>
-             <property name="tab_expand">False</property>
-             <property name="tab_fill">True</property>
+             <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>
+
+      <child>
+       <widget class="GtkHButtonBox" id="hbuttonbox2">
+         <property name="border_width">5</property>
+         <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+         <property name="spacing">10</property>
 
          <child>
-           <widget class="GtkLabel" id="options_tab">
+           <widget class="GtkButton" id="helpbutton">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Advanced</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="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>
+             <signal name="clicked" handler="doc_menu_cb"/>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="closebutton">
+             <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>
+             <signal name="clicked" handler="exit_menu_cb"/>
            </widget>
-           <packing>
-             <property name="type">tab</property>
-           </packing>
          </child>
        </widget>
        <packing>
          <property name="padding">0</property>
-         <property name="expand">True</property>
+         <property name="expand">False</property>
          <property name="fill">True</property>
+         <property name="pack_type">GTK_PACK_END</property>
        </packing>
       </child>
     </widget>
@@ -1663,21 +2517,25 @@ Available</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="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog_vbox">
-      <property name="border_width">2</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
        <widget class="GtkHButtonBox" id="dialog_action_area">
-         <property name="border_width">5</property>
          <property name="visible">True</property>
          <property name="layout_style">GTK_BUTTONBOX_END</property>
-         <property name="spacing">10</property>
 
          <child>
            <widget class="GtkButton" id="adv_button">
@@ -1687,6 +2545,7 @@ Available</property>
              <property name="label" translatable="yes">_Advanced &gt;&gt;</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
              <property name="response_id">0</property>
              <signal name="clicked" handler="settings_adv_cb"/>
            </widget>
@@ -1700,11 +2559,26 @@ Available</property>
              <property name="label" translatable="yes">_Standard &lt;&lt;</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
              <property name="response_id">0</property>
              <signal name="clicked" handler="settings_std_cb"/>
            </widget>
          </child>
 
+         <child>
+           <widget class="GtkButton" id="reset_button">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label" translatable="yes">_Reset to Defaults</property>
+             <property name="use_underline">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">0</property>
+             <signal name="clicked" handler="settings_reset_cb"/>
+           </widget>
+         </child>
+
          <child>
            <widget class="GtkButton" id="cancel_button">
              <property name="visible">True</property>
@@ -1713,6 +2587,7 @@ Available</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>
              <signal name="clicked" handler="settings_cancel_cb"/>
            </widget>
@@ -1726,6 +2601,7 @@ Available</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>
              <property name="response_id">-5</property>
              <signal name="clicked" handler="settings_ok_cb"/>
            </widget>
@@ -1740,17 +2616,20 @@ Available</property>
       </child>
 
       <child>
-       <widget class="GtkHBox" id="hbox1">
+       <widget class="GtkVBox" id="vbox1">
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
-         <property name="spacing">8</property>
+         <property name="spacing">0</property>
 
          <child>
            <widget class="GtkFrame" id="opt_frame">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Settings</property>
              <property name="label_xalign">0</property>
+             <property name="label_yalign">0</property>
              <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+             <accessibility>
+               <atkrelation target="label6" type="labelled-by"/>
+             </accessibility>
 
              <child>
                <widget class="GtkNotebook" id="opt_notebook">
@@ -1761,8 +2640,6 @@ Available</property>
                  <property name="show_border">False</property>
                  <property name="tab_pos">GTK_POS_BOTTOM</property>
                  <property name="scrollable">False</property>
-                 <property name="tab_hborder">2</property>
-                 <property name="tab_vborder">2</property>
                  <property name="enable_popup">False</property>
                  <signal name="switch_page" handler="settings_switch_page_cb"/>
 
@@ -1777,8 +2654,9 @@ Available</property>
                      </child>
                    </widget>
                    <packing>
-                     <property name="tab_expand">False</property>
+                     <property name="tab_expand">True</property>
                      <property name="tab_fill">True</property>
+                     <property name="tab_pack">GTK_PACK_END</property>
                    </packing>
                  </child>
 
@@ -1795,6 +2673,10 @@ Available</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="type">tab</property>
@@ -1813,7 +2695,7 @@ Available</property>
                      <child>
                        <widget class="GtkImage" id="cmd_logo">
                          <property name="visible">True</property>
-                         <property name="pixbuf">screensaver-cmndln.xpm</property>
+                         <property name="pixbuf">screensaver-cmndln.png</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
                          <property name="xpad">4</property>
@@ -1843,6 +2725,13 @@ Available</property>
                          <property name="xpad">0</property>
                          <property name="ypad">0</property>
                          <property name="mnemonic_widget">cmd_text</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>
+                         <accessibility>
+                           <atkrelation target="cmd_text" type="label-for"/>
+                         </accessibility>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -1863,8 +2752,11 @@ Available</property>
                          <property name="max_length">0</property>
                          <property name="text" translatable="yes"></property>
                          <property name="has_frame">True</property>
-                         <property name="invisible_char" translatable="yes">*</property>
+                         <property name="invisible_char">*</property>
                          <property name="activates_default">False</property>
+                         <accessibility>
+                           <atkrelation target="cmd_label" type="labelled-by"/>
+                         </accessibility>
                        </widget>
                        <packing>
                          <property name="left_attach">1</property>
@@ -1895,6 +2787,13 @@ Available</property>
                              <property name="xpad">3</property>
                              <property name="ypad">0</property>
                              <property name="mnemonic_widget">visual_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>
+                             <accessibility>
+                               <atkrelation target="visual_combo" type="label-for"/>
+                             </accessibility>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
@@ -1911,6 +2810,9 @@ Available</property>
                              <property name="case_sensitive">False</property>
                              <property name="enable_arrow_keys">True</property>
                              <property name="enable_arrows_always">False</property>
+                             <accessibility>
+                               <atkrelation target="visual" type="labelled-by"/>
+                             </accessibility>
 
                              <child internal-child="entry">
                                <widget class="GtkEntry" id="visual_entry">
@@ -1921,7 +2823,7 @@ Available</property>
                                  <property name="max_length">0</property>
                                  <property name="text" translatable="yes"></property>
                                  <property name="has_frame">True</property>
-                                 <property name="invisible_char" translatable="yes">*</property>
+                                 <property name="invisible_char">*</property>
                                  <property name="activates_default">False</property>
                                </widget>
                              </child>
@@ -2039,8 +2941,8 @@ Available</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
                            </packing>
                          </child>
                        </widget>
@@ -2073,6 +2975,10 @@ Available</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
                    </widget>
                    <packing>
                      <property name="type">tab</property>
@@ -2080,6 +2986,32 @@ Available</property>
                  </child>
                </widget>
              </child>
+
+             <child>
+               <widget class="GtkLabel" id="label6">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Settings</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>
+                 <accessibility>
+                   <atkrelation target="opt_frame" type="label-for"/>
+                 </accessibility>
+               </widget>
+               <packing>
+                 <property name="type">label_item</property>
+               </packing>
+             </child>
            </widget>
            <packing>
              <property name="padding">0</property>
@@ -2091,9 +3023,9 @@ Available</property>
          <child>
            <widget class="GtkFrame" id="doc_frame">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Description</property>
              <property name="label_xalign">0</property>
-             <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+             <property name="label_yalign">0</property>
+             <property name="shadow_type">GTK_SHADOW_NONE</property>
 
              <child>
                <widget class="GtkVBox" id="doc_vbox">
@@ -2112,10 +3044,14 @@ Available</property>
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
                      <property name="wrap">True</property>
                      <property name="selectable">True</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
+                     <property name="xalign">0</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>
@@ -2125,13 +3061,28 @@ Available</property>
                  </child>
 
                  <child>
-                   <widget class="GtkButton" id="manual">
+                   <widget class="GtkHBox" id="hbox1">
                      <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Documentation...</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <signal name="clicked" handler="manual_cb"/>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">0</property>
+
+                     <child>
+                       <widget class="GtkButton" id="manual">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">_Documentation...</property>
+                         <property name="use_underline">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <signal name="clicked" handler="manual_cb"/>
+                       </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>
@@ -2141,11 +3092,34 @@ Available</property>
                  </child>
                </widget>
              </child>
+
+             <child>
+               <widget class="GtkLabel" id="label7">
+                 <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="type">label_item</property>
+               </packing>
+             </child>
            </widget>
            <packing>
              <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
            </packing>
          </child>
        </widget>