diff -crB nautilus/src/nautilus-file-management-properties.c nautilus_mod/src/nautilus-file-management-properties.c
*** nautilus/src/nautilus-file-management-properties.c	2010-02-05 19:28:54.828879758 -0600
--- nautilus_mod/src/nautilus-file-management-properties.c	2010-02-05 16:46:49.776875000 -0600
***************
*** 70,76 ****
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN "media_automount_open_checkbutton"
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTORUN_NEVER "media_autorun_never_checkbutton"
! 
  /* int enums */
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
  
--- 70,76 ----
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN "media_automount_open_checkbutton"
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTORUN_NEVER "media_autorun_never_checkbutton"
! #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY "location_entry_checkbutton"
  /* int enums */
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
  
***************
*** 730,736 ****
  	eel_preferences_builder_connect_bool (builder,
  					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET,
  					      NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
! 	
  	eel_preferences_builder_connect_string_enum_combo_box (builder,
  							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
  							       NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
--- 730,738 ----
  	eel_preferences_builder_connect_bool (builder,
  					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET,
  					      NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
! 	eel_preferences_builder_connect_bool (builder,
! 					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY,
! 					      NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY);	
  	eel_preferences_builder_connect_string_enum_combo_box (builder,
  							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
  							       NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
diff -crB nautilus/src/nautilus-file-management-properties.ui nautilus_mod/src/nautilus-file-management-properties.ui
*** nautilus/src/nautilus-file-management-properties.ui	2010-02-05 19:28:54.832879847 -0600
--- nautilus_mod/src/nautilus-file-management-properties.ui	2010-02-05 16:47:06.256886000 -0600
***************
*** 1,8 ****
  <?xml version="1.0"?>
- <!--*- mode: xml -*-->
  <interface>
    <object class="GtkListStore" id="model1">
      <columns>
        <column type="gchararray"/>
      </columns>
      <data>
--- 1,10 ----
  <?xml version="1.0"?>
  <interface>
+   <!-- interface-requires gtk+ 2.12 -->
+   <!-- interface-naming-policy toplevel-contextual -->
    <object class="GtkListStore" id="model1">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 19,24 ****
--- 21,27 ----
    </object>
    <object class="GtkListStore" id="model2">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 41,46 ****
--- 44,50 ----
    </object>
    <object class="GtkListStore" id="model3">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 69,74 ****
--- 73,79 ----
    </object>
    <object class="GtkListStore" id="model4">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 97,102 ****
--- 102,108 ----
    </object>
    <object class="GtkListStore" id="model5">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 125,130 ****
--- 131,137 ----
    </object>
    <object class="GtkListStore" id="model6">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 141,146 ****
--- 148,154 ----
    </object>
    <object class="GtkListStore" id="model7">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 157,162 ****
--- 165,171 ----
    </object>
    <object class="GtkListStore" id="model8">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 194,199 ****
--- 203,209 ----
    </object>
    <object class="GtkListStore" id="model9">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 210,215 ****
--- 220,226 ----
    </object>
    <object class="GtkListStore" id="model10">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
      <data>
***************
*** 226,406 ****
    </object>
    <object class="GtkListStore" id="model11">
      <columns>
        <column type="gchararray"/>
      </columns>
-     <data>
-     </data>
    </object>
    <object class="GtkListStore" id="model12">
      <columns>
        <column type="gchararray"/>
      </columns>
-     <data>
-     </data>
    </object>
    <object class="GtkListStore" id="model13">
      <columns>
        <column type="gchararray"/>
      </columns>
-     <data>
-     </data>
    </object>
    <object class="GtkListStore" id="model14">
      <columns>
        <column type="gchararray"/>
      </columns>
    </object>
    <object class="GtkDialog" id="file_management_dialog">
      <property name="border_width">5</property>
      <property name="title" translatable="yes">File Management Preferences</property>
!     <property name="type">GTK_WINDOW_TOPLEVEL</property>
!     <property name="window_position">GTK_WIN_POS_CENTER</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">
        <object class="GtkVBox" id="dialog-vbox1">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
          <property name="spacing">2</property>
-         <child internal-child="action_area">
-           <object class="GtkHButtonBox" id="dialog-action_area1">
-             <property name="visible">True</property>
-             <property name="layout_style">GTK_BUTTONBOX_END</property>
-             <child>
-               <object class="GtkButton" id="helpbutton1">
-                 <property name="visible">True</property>
-                 <property name="can_default">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label">gtk-help</property>
-                 <property name="use_stock">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-               </object>
-             </child>
-             <child>
-               <object class="GtkButton" id="closebutton1">
-                 <property name="visible">True</property>
-                 <property name="can_default">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label">gtk-close</property>
-                 <property name="use_stock">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-               </object>
-             </child>
-           </object>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">True</property>
-             <property name="pack_type">GTK_PACK_END</property>
-           </packing>
-         </child>
          <child>
            <object class="GtkNotebook" id="notebook1">
-             <property name="border_width">5</property>
              <property name="visible">True</property>
              <property name="can_focus">True</property>
!             <property name="show_tabs">True</property>
!             <property name="show_border">True</property>
!             <property name="tab_pos">GTK_POS_TOP</property>
!             <property name="scrollable">False</property>
!             <property name="enable_popup">False</property>
              <child>
                <object class="GtkVBox" id="vbox1">
-                 <property name="border_width">12</property>
                  <property name="visible">True</property>
!                 <property name="homogeneous">False</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox2">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label4">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment2">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox14">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox34">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_0">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">View _new folders using:</property>
                                      <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
                                      <property name="mnemonic_widget">default_view_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="default_view_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model1</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer1"/>
--- 237,330 ----
    </object>
    <object class="GtkListStore" id="model11">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
    </object>
    <object class="GtkListStore" id="model12">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
    </object>
    <object class="GtkListStore" id="model13">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
    </object>
    <object class="GtkListStore" id="model14">
      <columns>
+       <!-- column-name gchararray -->
        <column type="gchararray"/>
      </columns>
    </object>
    <object class="GtkDialog" id="file_management_dialog">
      <property name="border_width">5</property>
      <property name="title" translatable="yes">File Management Preferences</property>
!     <property name="window_position">center</property>
!     <property name="type_hint">dialog</property>
      <property name="has_separator">False</property>
      <child internal-child="vbox">
        <object class="GtkVBox" id="dialog-vbox1">
          <property name="visible">True</property>
          <property name="spacing">2</property>
          <child>
            <object class="GtkNotebook" id="notebook1">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
!             <property name="border_width">5</property>
              <child>
                <object class="GtkVBox" id="vbox1">
                  <property name="visible">True</property>
!                 <property name="border_width">12</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox2">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label4">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment2">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox14">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox34">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_0">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">View _new folders using:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">default_view_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="default_view_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model1</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer1"/>
***************
*** 410,462 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox11">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_1">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">_Arrange items:</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">sort_order_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="sort_order_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model2</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer2"/>
--- 334,368 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox11">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_1">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">_Arrange items:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">sort_order_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="sort_order_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model2</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer2"/>
***************
*** 466,615 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="sort_folders_first_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">Sort _folders before files</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="hidden_files_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">Show hidden and _backup files</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox3">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label5">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment1">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox16">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox35">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_2">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Default _zoom level:</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">icon_view_zoom_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="icon_view_zoom_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model3</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer3"/>
--- 372,487 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">1</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="sort_folders_first_checkbutton">
+                                 <property name="label" translatable="yes">Sort _folders before files</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">2</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="hidden_files_checkbutton">
+                                 <property name="label" translatable="yes">Show hidden and _backup files</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">3</property>
+                               </packing>
+                             </child>
+                             <child>
+                               <object class="GtkCheckButton" id="location_entry_checkbutton">
+                                 <property name="label" translatable="yes">Al_ways use textual location entry</property>
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="receives_default">False</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+                                 <property name="position">4</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">0</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox3">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label5">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment1">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox16">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox35">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_2">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Default _zoom level:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">icon_view_zoom_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="icon_view_zoom_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model3</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer3"/>
***************
*** 619,768 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="compact_layout_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_Use compact layout</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="labels_beside_icons_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_Text beside icons</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Compact View Defaults&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox42">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_4">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">_Default zoom level:</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">compact_view_zoom_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="compact_view_zoom_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model4</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer4"/>
--- 491,593 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="compact_layout_checkbutton">
+                                 <property name="label" translatable="yes">_Use compact layout</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">1</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="labels_beside_icons_checkbutton">
+                                 <property name="label" translatable="yes">_Text beside icons</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">2</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">1</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Compact View Defaults&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox42">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_4">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">_Default zoom level:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">compact_view_zoom_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="compact_view_zoom_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model4</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer4"/>
***************
*** 772,903 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="all_columns_same_width_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">A_ll columns have the same width</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox4">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label6">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment3">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox15">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox36">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_3">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">D_efault zoom level:</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">list_view_zoom_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="list_view_zoom_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model5</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer5"/>
--- 597,684 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="all_columns_same_width_checkbutton">
+                                 <property name="label" translatable="yes">A_ll columns have the same width</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">1</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">2</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox4">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label6">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment3">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox15">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox36">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="views_label_3">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">D_efault zoom level:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">list_view_zoom_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="list_view_zoom_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model5</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer5"/>
***************
*** 907,1539 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox24">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label25">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment4">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox25">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkCheckButton" id="treeview_folders_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">Show _only folders</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                </object>
-               <packing>
-                 <property name="tab_expand">False</property>
-                 <property name="tab_fill">True</property>
-               </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label1">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Views</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </object>
              </child>
              <child>
                <object class="GtkVBox" id="vbox5">
-                 <property name="border_width">12</property>
                  <property name="visible">True</property>
!                 <property name="homogeneous">False</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox6">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label10">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment5">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox17">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">0</property>
                              <child>
                                <object class="GtkRadioButton" id="single_click_radiobutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_Single click to open items</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkRadioButton" id="double_click_radiobutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_Double click to open items</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                  <property name="group">single_click_radiobutton</property>
                                </object>
                                <packing>
-                                 <property name="padding">6</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkLabel" id="label99">
                                  <property name="height_request">6</property>
                                  <property name="visible">True</property>
!                                 <property name="label" translatable="yes"/>
!                                 <property name="use_underline">False</property>
!                                 <property name="use_markup">False</property>
!                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
!                                 <property name="wrap">False</property>
!                                 <property name="selectable">False</property>
!                                 <property name="xalign">0.5</property>
!                                 <property name="yalign">0.5</property>
!                                 <property name="xpad">0</property>
!                                 <property name="ypad">0</property>
!                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
!                                 <property name="width_chars">-1</property>
!                                 <property name="single_line_mode">False</property>
!                                 <property name="angle">0</property>
!                               </object>
!                               <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="always_use_browser_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">Open each _folder its own window</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox7">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label12">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment6">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox18">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkRadioButton" id="scripts_execute_radiobutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_Run executable text files when they are opened</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkRadioButton" id="scripts_view_radiobutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_View executable text files when they are opened</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                  <property name="group">scripts_execute_radiobutton</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkRadioButton" id="scripts_confirm_radiobutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">_Ask each 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">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                  <property name="group">scripts_execute_radiobutton</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox8">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label14">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment7">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox19">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkCheckButton" id="trash_confirm_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="trash_delete_checkbutton">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
                                  <property name="use_underline">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                                 <property name="active">False</property>
-                                 <property name="inconsistent">False</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="tab_expand">False</property>
!                 <property name="tab_fill">True</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label2">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Behavior</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </object>
              </child>
              <child>
                <object class="GtkVBox" id="vbox26">
-                 <property name="border_width">12</property>
                  <property name="visible">True</property>
!                 <property name="homogeneous">False</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox27">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label28">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment8">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox28">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkLabel" id="label29">
                                  <property name="visible">True</property>
                                  <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
-                                 <property name="use_underline">False</property>
-                                 <property name="use_markup">False</property>
-                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                  <property name="wrap">True</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox28">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">0</property>
                                  <child>
                                    <object class="GtkLabel" id="captions_label_0">
                                      <property name="visible">True</property>
-                                     <property name="label"/>
-                                     <property name="use_underline">False</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="captions_0_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model11</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer"/>
--- 688,1106 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">3</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox24">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label25">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment4">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox25">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkCheckButton" id="treeview_folders_checkbutton">
+                                 <property name="label" translatable="yes">Show _only folders</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">4</property>
                    </packing>
                  </child>
+                 <child>
+                   <placeholder/>
+                 </child>
                </object>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label1">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Views</property>
                </object>
+               <packing>
+                 <property name="tab_fill">False</property>
+               </packing>
              </child>
              <child>
                <object class="GtkVBox" id="vbox5">
                  <property name="visible">True</property>
!                 <property name="border_width">12</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox6">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label10">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment5">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox17">
                              <property name="visible">True</property>
                              <child>
                                <object class="GtkRadioButton" id="single_click_radiobutton">
+                                 <property name="label" translatable="yes">_Single click to open items</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkRadioButton" id="double_click_radiobutton">
+                                 <property name="label" translatable="yes">_Double click to open items</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                  <property name="group">single_click_radiobutton</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="padding">6</property>
+                                 <property name="position">1</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkLabel" id="label99">
                                  <property name="height_request">6</property>
                                  <property name="visible">True</property>
!                               </object>
!                               <packing>
!                                 <property name="position">2</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="always_use_browser_checkbutton">
+                                 <property name="label" translatable="yes">Open each _folder its own window</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">3</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">0</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox7">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label12">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment6">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox18">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkRadioButton" id="scripts_execute_radiobutton">
+                                 <property name="label" translatable="yes">_Run executable text files when they are opened</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkRadioButton" id="scripts_view_radiobutton">
+                                 <property name="label" translatable="yes">_View executable text files when they are opened</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                  <property name="group">scripts_execute_radiobutton</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">1</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkRadioButton" id="scripts_confirm_radiobutton">
+                                 <property name="label" translatable="yes">_Ask each time</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                  <property name="group">scripts_execute_radiobutton</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">2</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">1</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox8">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label14">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment7">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox19">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkCheckButton" id="trash_confirm_checkbutton">
+                                 <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkCheckButton" id="trash_delete_checkbutton">
+                                 <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
!                                 <property name="receives_default">False</property>
                                  <property name="use_underline">True</property>
                                  <property name="draw_indicator">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">1</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">2</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="position">1</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label2">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Behavior</property>
                </object>
+               <packing>
+                 <property name="position">1</property>
+                 <property name="tab_fill">False</property>
+               </packing>
              </child>
              <child>
                <object class="GtkVBox" id="vbox26">
                  <property name="visible">True</property>
!                 <property name="border_width">12</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox27">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label28">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment8">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox28">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkLabel" id="label29">
                                  <property name="visible">True</property>
+                                 <property name="xalign">0</property>
                                  <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
                                  <property name="wrap">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox28">
                                  <property name="visible">True</property>
                                  <child>
                                    <object class="GtkLabel" id="captions_label_0">
                                      <property name="visible">True</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="captions_0_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model11</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer"/>
***************
*** 1543,1594 ****
                                      </child>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox29">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">0</property>
                                  <child>
                                    <object class="GtkLabel" id="captions_label_1">
                                      <property name="visible">True</property>
-                                     <property name="label"/>
                                      <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="captions_1_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model12</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer12"/>
--- 1110,1141 ----
                                      </child>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">1</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox29">
                                  <property name="visible">True</property>
                                  <child>
                                    <object class="GtkLabel" id="captions_label_1">
                                      <property name="visible">True</property>
                                      <property name="use_underline">True</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="captions_1_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model12</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer12"/>
***************
*** 1598,1649 ****
                                      </child>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox30">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">0</property>
                                  <child>
                                    <object class="GtkLabel" id="captions_label_2">
                                      <property name="visible">True</property>
-                                     <property name="label"/>
-                                     <property name="use_underline">False</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="captions_2_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model13</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer13"/>
--- 1145,1177 ----
                                      </child>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">2</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox30">
                                  <property name="visible">True</property>
                                  <child>
                                    <object class="GtkLabel" id="captions_label_2">
                                      <property name="visible">True</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="captions_2_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model13</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer13"/>
***************
*** 1653,1761 ****
                                      </child>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox31">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label34">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment9">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkHBox" id="hbox33">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">12</property>
                              <child>
                                <object class="GtkLabel" id="label36">
                                  <property name="visible">True</property>
                                  <property name="label" translatable="yes">_Format:</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">date_format_combobox</property>
-                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkComboBox" id="date_format_combobox">
                                  <property name="visible">True</property>
-                                 <property name="add_tearoffs">False</property>
-                                 <property name="focus_on_click">True</property>
                                  <property name="model">model14</property>
                                  <child>
                                    <object class="GtkCellRendererText" id="renderer14"/>
--- 1181,1249 ----
                                      </child>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">3</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">0</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox31">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label34">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment9">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkHBox" id="hbox33">
                              <property name="visible">True</property>
                              <property name="spacing">12</property>
                              <child>
                                <object class="GtkLabel" id="label36">
                                  <property name="visible">True</property>
                                  <property name="label" translatable="yes">_Format:</property>
                                  <property name="use_underline">True</property>
                                  <property name="mnemonic_widget">date_format_combobox</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkComboBox" id="date_format_combobox">
                                  <property name="visible">True</property>
                                  <property name="model">model14</property>
                                  <child>
                                    <object class="GtkCellRendererText" id="renderer14"/>
***************
*** 1765,1889 ****
                                  </child>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="tab_expand">False</property>
!                 <property name="tab_fill">True</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label24">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Display</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </object>
              </child>
              <child>
                <object class="GtkVBox" id="vbox29">
-                 <property name="border_width">12</property>
                  <property name="visible">True</property>
!                 <property name="homogeneous">False</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox30">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label31">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment21">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="list_columns_vbox">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkLabel" id="label33">
                                  <property name="visible">True</property>
                                  <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
-                                 <property name="use_underline">False</property>
-                                 <property name="use_markup">False</property>
-                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                  <property name="wrap">True</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
                                </object>
                                <packing>
-                                 <property name="padding">0</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
                              <child>
--- 1253,1332 ----
                                  </child>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">1</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">1</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="position">2</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label24">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Display</property>
                </object>
+               <packing>
+                 <property name="position">2</property>
+                 <property name="tab_fill">False</property>
+               </packing>
              </child>
              <child>
                <object class="GtkVBox" id="vbox29">
                  <property name="visible">True</property>
!                 <property name="border_width">12</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox30">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label31">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment21">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="list_columns_vbox">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkLabel" id="label33">
                                  <property name="visible">True</property>
+                                 <property name="xalign">0</property>
                                  <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
                                  <property name="wrap">True</property>
                                </object>
                                <packing>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
+                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
***************
*** 1893,2021 ****
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
!                     <property name="padding">0</property>
!                     <property name="expand">True</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="tab_expand">False</property>
!                 <property name="tab_fill">True</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label30">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">List Columns</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </object>
              </child>
              <child>
                <object class="GtkVBox" id="vbox9">
-                 <property name="border_width">12</property>
                  <property name="visible">True</property>
!                 <property name="homogeneous">False</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox10">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label16">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment10">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox20">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox24">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_0">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Show te_xt in icons:</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">preview_text_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_text_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model6</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer6"/>
--- 1336,1415 ----
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
!                     <property name="position">0</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="position">3</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label30">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">List Columns</property>
                </object>
+               <packing>
+                 <property name="position">3</property>
+                 <property name="tab_fill">False</property>
+               </packing>
              </child>
              <child>
                <object class="GtkVBox" id="vbox9">
                  <property name="visible">True</property>
!                 <property name="border_width">12</property>
                  <property name="spacing">18</property>
                  <child>
                    <object class="GtkVBox" id="vbox10">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label16">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment10">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox20">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox24">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_0">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Show te_xt in icons:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">preview_text_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_text_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model6</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer6"/>
***************
*** 2025,2138 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox11">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label18">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment11">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox21">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox20">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_1">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Show _thumbnails:</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">preview_image_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_image_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model7</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer7"/>
--- 1419,1491 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">0</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox11">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label18">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment11">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox21">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox20">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_1">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Show _thumbnails:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">preview_image_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_image_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model7</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer7"/>
***************
*** 2142,2194 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox21">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_2">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">_Only for files smaller than:</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">preview_image_size_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_image_size_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model8</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer8"/>
--- 1495,1529 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                              <child>
                                <object class="GtkHBox" id="hbox21">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_2">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">_Only for files smaller than:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">preview_image_size_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_image_size_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model8</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer8"/>
***************
*** 2198,2311 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox12">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label20">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment12">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox22">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox22">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_3">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Preview _sound files:</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">preview_sound_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_sound_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model9</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer9"/>
--- 1533,1605 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">1</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">1</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox12">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label20">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment12">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox22">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox22">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_3">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Preview _sound files:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">preview_sound_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_sound_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model9</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer9"/>
***************
*** 2315,2428 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox13">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label22">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
                          <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
                        </object>
                        <packing>
-                         <property name="padding">0</property>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment13">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
                          <property name="left_padding">12</property>
-                         <property name="right_padding">0</property>
                          <child>
                            <object class="GtkVBox" id="vbox23">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox23">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_4">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Count _number of items:</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">preview_folder_combobox</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_folder_combobox">
                                      <property name="visible">True</property>
-                                     <property name="add_tearoffs">False</property>
-                                     <property name="focus_on_click">True</property>
                                      <property name="model">model10</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer10"/>
--- 1609,1681 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">2</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkVBox" id="vbox13">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkLabel" id="label22">
                          <property name="visible">True</property>
+                         <property name="xalign">0</property>
                          <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
                          <property name="use_markup">True</property>
                        </object>
                        <packing>
                          <property name="expand">False</property>
                          <property name="fill">False</property>
+                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkAlignment" id="alignment13">
                          <property name="visible">True</property>
                          <property name="left_padding">12</property>
                          <child>
                            <object class="GtkVBox" id="vbox23">
                              <property name="visible">True</property>
                              <property name="spacing">6</property>
                              <child>
                                <object class="GtkHBox" id="hbox23">
                                  <property name="visible">True</property>
                                  <property name="spacing">12</property>
                                  <child>
                                    <object class="GtkLabel" id="preview_label_4">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Count _number of items:</property>
                                      <property name="use_underline">True</property>
                                      <property name="mnemonic_widget">preview_folder_combobox</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
                                    <object class="GtkComboBox" id="preview_folder_combobox">
                                      <property name="visible">True</property>
                                      <property name="model">model10</property>
                                      <child>
                                        <object class="GtkCellRendererText" id="renderer10"/>
***************
*** 2432,2568 ****
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="padding">0</property>
!                                 <property name="expand">True</property>
!                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
!                     <property name="fill">True</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="tab_expand">False</property>
!                 <property name="tab_fill">True</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label3">
                  <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>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </object>
              </child>
              <child>
                <object class="GtkVBox" id="vbox34">
-                 <property name="border_width">12</property>
                  <property name="visible">True</property>
!                 <property name="homogeneous">False</property>
                  <property name="spacing">6</property>
                  <child>
                    <object class="GtkVBox" id="media_handling_vbox">
                      <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkVBox" id="vbox44">
                          <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
                          <property name="spacing">6</property>
                          <child>
                            <object class="GtkLabel" id="label42">
                              <property name="visible">True</property>
                              <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
-                             <property name="use_underline">False</property>
                              <property name="use_markup">True</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
                            </object>
                            <packing>
-                             <property name="padding">0</property>
                              <property name="expand">False</property>
                              <property name="fill">False</property>
                            </packing>
                          </child>
                          <child>
                            <object class="GtkAlignment" id="alignment18">
                              <property name="visible">True</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xscale">1</property>
-                             <property name="yscale">1</property>
-                             <property name="top_padding">0</property>
-                             <property name="bottom_padding">0</property>
                              <property name="left_padding">12</property>
-                             <property name="right_padding">0</property>
                              <child>
                                <object class="GtkVBox" id="vbox52">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">6</property>
                                  <child>
                                    <object class="GtkLabel" id="label60">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Choose what happens when inserting media or connecting devices to the system</property>
-                                     <property name="use_underline">False</property>
                                      <property name="use_markup">True</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                      <property name="wrap">True</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
--- 1685,1772 ----
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                                <packing>
!                                 <property name="position">0</property>
                                </packing>
                              </child>
                            </object>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
!                     <property name="position">3</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="position">4</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label3">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Preview</property>
                </object>
+               <packing>
+                 <property name="position">4</property>
+                 <property name="tab_fill">False</property>
+               </packing>
              </child>
              <child>
                <object class="GtkVBox" id="vbox34">
                  <property name="visible">True</property>
!                 <property name="border_width">12</property>
                  <property name="spacing">6</property>
                  <child>
                    <object class="GtkVBox" id="media_handling_vbox">
                      <property name="visible">True</property>
                      <property name="spacing">6</property>
                      <child>
                        <object class="GtkVBox" id="vbox44">
                          <property name="visible">True</property>
                          <property name="spacing">6</property>
                          <child>
                            <object class="GtkLabel" id="label42">
                              <property name="visible">True</property>
+                             <property name="xalign">0</property>
                              <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
                              <property name="use_markup">True</property>
                            </object>
                            <packing>
                              <property name="expand">False</property>
                              <property name="fill">False</property>
+                             <property name="position">0</property>
                            </packing>
                          </child>
                          <child>
                            <object class="GtkAlignment" id="alignment18">
                              <property name="visible">True</property>
                              <property name="left_padding">12</property>
                              <child>
                                <object class="GtkVBox" id="vbox52">
                                  <property name="visible">True</property>
                                  <property name="spacing">6</property>
                                  <child>
                                    <object class="GtkLabel" id="label60">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Choose what happens when inserting media or connecting devices to the system</property>
                                      <property name="use_markup">True</property>
                                      <property name="wrap">True</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
***************
*** 2570,2882 ****
                                      <property name="visible">True</property>
                                      <property name="n_rows">5</property>
                                      <property name="n_columns">2</property>
-                                     <property name="homogeneous">False</property>
-                                     <property name="row_spacing">6</property>
                                      <property name="column_spacing">6</property>
                                      <child>
                                        <object class="GtkLabel" id="label44">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">CD _Audio:</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">media_audio_cdda_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
!                                         <property name="left_attach">0</property>
!                                         <property name="right_attach">1</property>
!                                         <property name="top_attach">0</property>
!                                         <property name="bottom_attach">1</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label50">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">_DVD Video:</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">media_video_dvd_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
-                                         <property name="left_attach">0</property>
-                                         <property name="right_attach">1</property>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_audio_cdda_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
!                                         <property name="top_attach">0</property>
!                                         <property name="bottom_attach">1</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_video_dvd_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label54">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">_Music Player:</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">media_music_player_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
-                                         <property name="left_attach">0</property>
-                                         <property name="right_attach">1</property>
                                          <property name="top_attach">2</property>
                                          <property name="bottom_attach">3</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_music_player_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">2</property>
                                          <property name="bottom_attach">3</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label59">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">_Photos:</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">media_dcf_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
-                                         <property name="left_attach">0</property>
-                                         <property name="right_attach">1</property>
                                          <property name="top_attach">3</property>
                                          <property name="bottom_attach">4</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_dcf_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">3</property>
                                          <property name="bottom_attach">4</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label57">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">_Software:</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">media_software_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
-                                         <property name="left_attach">0</property>
-                                         <property name="right_attach">1</property>
                                          <property name="top_attach">4</property>
                                          <property name="bottom_attach">5</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_software_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">4</property>
                                          <property name="bottom_attach">5</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                              </child>
                            </object>
                            <packing>
!                             <property name="padding">0</property>
!                             <property name="expand">True</property>
!                             <property name="fill">True</property>
                            </packing>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkVBox" id="vbox50">
                          <property name="visible">True</property>
-                         <property name="homogeneous">False</property>
                          <property name="spacing">6</property>
                          <child>
                            <object class="GtkLabel" id="label61">
                              <property name="visible">True</property>
                              <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
-                             <property name="use_underline">False</property>
                              <property name="use_markup">True</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                             <property name="width_chars">-1</property>
-                             <property name="single_line_mode">False</property>
-                             <property name="angle">0</property>
                            </object>
                            <packing>
-                             <property name="padding">0</property>
                              <property name="expand">False</property>
                              <property name="fill">False</property>
                            </packing>
                          </child>
                          <child>
                            <object class="GtkAlignment" id="alignment20">
                              <property name="visible">True</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xscale">1</property>
-                             <property name="yscale">1</property>
-                             <property name="top_padding">0</property>
-                             <property name="bottom_padding">0</property>
                              <property name="left_padding">12</property>
-                             <property name="right_padding">0</property>
                              <child>
                                <object class="GtkVBox" id="vbox51">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
                                  <property name="spacing">6</property>
                                  <child>
                                    <object class="GtkLabel" id="label65">
                                      <property name="visible">True</property>
                                      <property name="label" translatable="yes">Less common media formats can be configured here</property>
-                                     <property name="use_underline">False</property>
                                      <property name="use_markup">True</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                      <property name="wrap">True</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </object>
                                    <packing>
-                                     <property name="padding">0</property>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
                                    </packing>
                                  </child>
                                  <child>
--- 1774,1970 ----
                                      <property name="visible">True</property>
                                      <property name="n_rows">5</property>
                                      <property name="n_columns">2</property>
                                      <property name="column_spacing">6</property>
+                                     <property name="row_spacing">6</property>
                                      <child>
                                        <object class="GtkLabel" id="label44">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">CD _Audio:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_audio_cdda_combobox</property>
                                        </object>
                                        <packing>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label50">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">_DVD Video:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_video_dvd_combobox</property>
                                        </object>
                                        <packing>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_audio_cdda_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_video_dvd_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label54">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">_Music Player:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_music_player_combobox</property>
                                        </object>
                                        <packing>
                                          <property name="top_attach">2</property>
                                          <property name="bottom_attach">3</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_music_player_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">2</property>
                                          <property name="bottom_attach">3</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label59">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">_Photos:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_dcf_combobox</property>
                                        </object>
                                        <packing>
                                          <property name="top_attach">3</property>
                                          <property name="bottom_attach">4</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_dcf_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">3</property>
                                          <property name="bottom_attach">4</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label57">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">_Software:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_software_combobox</property>
                                        </object>
                                        <packing>
                                          <property name="top_attach">4</property>
                                          <property name="bottom_attach">5</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_software_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">4</property>
                                          <property name="bottom_attach">5</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                              </child>
                            </object>
                            <packing>
!                             <property name="position">1</property>
                            </packing>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">0</property>
                        </packing>
                      </child>
                      <child>
                        <object class="GtkVBox" id="vbox50">
                          <property name="visible">True</property>
                          <property name="spacing">6</property>
                          <child>
                            <object class="GtkLabel" id="label61">
                              <property name="visible">True</property>
+                             <property name="xalign">0</property>
                              <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
                              <property name="use_markup">True</property>
                            </object>
                            <packing>
                              <property name="expand">False</property>
                              <property name="fill">False</property>
+                             <property name="position">0</property>
                            </packing>
                          </child>
                          <child>
                            <object class="GtkAlignment" id="alignment20">
                              <property name="visible">True</property>
                              <property name="left_padding">12</property>
                              <child>
                                <object class="GtkVBox" id="vbox51">
                                  <property name="visible">True</property>
                                  <property name="spacing">6</property>
                                  <child>
                                    <object class="GtkLabel" id="label65">
                                      <property name="visible">True</property>
+                                     <property name="xalign">0</property>
                                      <property name="label" translatable="yes">Less common media formats can be configured here</property>
                                      <property name="use_markup">True</property>
                                      <property name="wrap">True</property>
                                    </object>
                                    <packing>
                                      <property name="expand">False</property>
                                      <property name="fill">False</property>
+                                     <property name="position">0</property>
                                    </packing>
                                  </child>
                                  <child>
***************
*** 2884,3073 ****
                                      <property name="visible">True</property>
                                      <property name="n_rows">2</property>
                                      <property name="n_columns">2</property>
-                                     <property name="homogeneous">False</property>
-                                     <property name="row_spacing">6</property>
                                      <property name="column_spacing">6</property>
                                      <child>
                                        <object class="GtkComboBox" id="media_other_type_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
!                                         <property name="top_attach">0</property>
!                                         <property name="bottom_attach">1</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label64">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">Acti_on:</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">media_other_action_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
-                                         <property name="left_attach">0</property>
-                                         <property name="right_attach">1</property>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_other_action_combobox">
                                          <property name="visible">True</property>
-                                         <property name="add_tearoffs">False</property>
-                                         <property name="focus_on_click">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options">fill</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label63">
                                          <property name="visible">True</property>
                                          <property name="label" translatable="yes">_Type:</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">media_other_type_combobox</property>
-                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                         <property name="width_chars">-1</property>
-                                         <property name="single_line_mode">False</property>
-                                         <property name="angle">0</property>
                                        </object>
                                        <packing>
!                                         <property name="left_attach">0</property>
!                                         <property name="right_attach">1</property>
!                                         <property name="top_attach">0</property>
!                                         <property name="bottom_attach">1</property>
!                                         <property name="x_options">fill</property>
!                                         <property name="y_options"/>
                                        </packing>
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="padding">0</property>
!                                     <property name="expand">True</property>
!                                     <property name="fill">True</property>
                                    </packing>
                                  </child>
                                </object>
                              </child>
                            </object>
                            <packing>
!                             <property name="padding">0</property>
!                             <property name="expand">True</property>
!                             <property name="fill">True</property>
                            </packing>
                          </child>
                        </object>
                        <packing>
!                         <property name="padding">0</property>
!                         <property name="expand">True</property>
!                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkCheckButton" id="media_autorun_never_checkbutton">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
!                     <property name="label" translatable="yes">_Never prompt or start programs on media insertion</property>
                      <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
                      <property name="draw_indicator">True</property>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkCheckButton" id="media_automount_open_checkbutton">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
!                     <property name="label" translatable="yes">B_rowse media when inserted</property>
                      <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
                      <property name="draw_indicator">True</property>
                    </object>
                    <packing>
-                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="tab_expand">False</property>
!                 <property name="tab_fill">True</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label38">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Media</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </object>
              </child>
            </object>
            <packing>
!             <property name="padding">0</property>
!             <property name="expand">True</property>
!             <property name="fill">True</property>
            </packing>
          </child>
        </object>
--- 1972,2143 ----
                                      <property name="visible">True</property>
                                      <property name="n_rows">2</property>
                                      <property name="n_columns">2</property>
                                      <property name="column_spacing">6</property>
+                                     <property name="row_spacing">6</property>
                                      <child>
                                        <object class="GtkComboBox" id="media_other_type_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label64">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">Acti_on:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_other_action_combobox</property>
                                        </object>
                                        <packing>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkComboBox" id="media_other_action_combobox">
                                          <property name="visible">True</property>
                                        </object>
                                        <packing>
                                          <property name="left_attach">1</property>
                                          <property name="right_attach">2</property>
                                          <property name="top_attach">1</property>
                                          <property name="bottom_attach">2</property>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options">GTK_FILL</property>
                                        </packing>
                                      </child>
                                      <child>
                                        <object class="GtkLabel" id="label63">
                                          <property name="visible">True</property>
+                                         <property name="xalign">0</property>
                                          <property name="label" translatable="yes">_Type:</property>
                                          <property name="use_underline">True</property>
                                          <property name="mnemonic_widget">media_other_type_combobox</property>
                                        </object>
                                        <packing>
!                                         <property name="x_options">GTK_FILL</property>
!                                         <property name="y_options"></property>
                                        </packing>
                                      </child>
                                    </object>
                                    <packing>
!                                     <property name="position">1</property>
                                    </packing>
                                  </child>
                                </object>
                              </child>
                            </object>
                            <packing>
!                             <property name="position">1</property>
                            </packing>
                          </child>
                        </object>
                        <packing>
!                         <property name="position">1</property>
                        </packing>
                      </child>
                    </object>
                    <packing>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
+                     <property name="position">0</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkCheckButton" id="media_autorun_never_checkbutton">
+                     <property name="label" translatable="yes">_Never prompt or start programs on media insertion</property>
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
!                     <property name="receives_default">False</property>
                      <property name="use_underline">True</property>
                      <property name="draw_indicator">True</property>
                    </object>
                    <packing>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
+                     <property name="position">1</property>
                    </packing>
                  </child>
                  <child>
                    <object class="GtkCheckButton" id="media_automount_open_checkbutton">
+                     <property name="label" translatable="yes">B_rowse media when inserted</property>
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
!                     <property name="receives_default">False</property>
                      <property name="use_underline">True</property>
                      <property name="draw_indicator">True</property>
                    </object>
                    <packing>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
+                     <property name="position">2</property>
                    </packing>
                  </child>
                </object>
                <packing>
!                 <property name="position">5</property>
                </packing>
              </child>
              <child type="tab">
                <object class="GtkLabel" id="label38">
                  <property name="visible">True</property>
                  <property name="label" translatable="yes">Media</property>
                </object>
+               <packing>
+                 <property name="position">5</property>
+                 <property name="tab_fill">False</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="position">1</property>
+           </packing>
+         </child>
+         <child internal-child="action_area">
+           <object class="GtkHButtonBox" id="dialog-action_area1">
+             <property name="visible">True</property>
+             <property name="layout_style">end</property>
+             <child>
+               <object class="GtkButton" id="helpbutton1">
+                 <property name="label">gtk-help</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+                 <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkButton" id="closebutton1">
+                 <property name="label">gtk-close</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+                 <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
              </child>
            </object>
            <packing>
!             <property name="expand">False</property>
!             <property name="pack_type">end</property>
!             <property name="position">0</property>
            </packing>
          </child>
        </object>
