[gnome-control-center] [universal-access] Tweak the design of the panel



commit 3c843ca3ac7436024ee19d48e394131db7aefb01
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Oct 31 21:51:43 2010 -0400

    [universal-access] Tweak the design of the panel
    
    Make sure to not expand vertically.  Tighten up the layout.

 panels/universal-access/uap.ui | 3456 ++++++++++++++++++++++------------------
 1 files changed, 1880 insertions(+), 1576 deletions(-)
---
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index 4da3e0e..c3b5769 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -129,1122 +129,1033 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkNotebook" id="notebook">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">True</property>
                     <child>
-                      <object class="GtkNotebook" id="notebook">
+                      <object class="GtkVBox" id="seeing_vbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
                         <child>
-                          <object class="GtkVBox" id="seeing_vbox">
+                          <object class="GtkFrame" id="frame5">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">12</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame5">
+                              <object class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="yscale">0</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment9">
+                                  <object class="GtkVBox" id="vbox9">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox9">
+                                      <object class="GtkTable" id="table2">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table2">
+                                          <object class="GtkHBox" id="hbox7">
                                             <property name="visible">True</property>
-                                            <property name="n_rows">3</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="column_spacing">24</property>
-                                            <property name="row_spacing">6</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="hbox7">
+                                              <object class="GtkLabel" id="label17">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="label17">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Change constrast:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label3">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Ctrl+Alt+0</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Change constrast:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkHBox" id="seeing_contrast_box">
+                                              <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label3">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">12</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_contrast_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Contrast:</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="mnemonic_widget">seeing_contrast_combobox</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkComboBox" id="seeing_contrast_combobox">
-                                                    <property name="visible">True</property>
-                                                    <property name="model">contrast_model</property>
-                                                    <property name="active">1</property>
-                                                    <child>
-                                                      <object class="GtkCellRendererText" id="contrast_renderer">
-                                                        <property name="font">Normal</property>
-                                                      </object>
-                                                      <attributes>
-                                                        <attribute name="scale">1</attribute>
-                                                        <attribute name="text">0</attribute>
-                                                      </attributes>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Ctrl+Alt+0</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="seeing_contrast_box">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">12</property>
                                             <child>
-                                              <object class="GtkHBox" id="seeing_text_size_box">
+                                              <object class="GtkLabel" id="seeing_contrast_label">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">12</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_text_size_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Text size:</property>
-                                                    <property name="use_underline">True</property>
-                                                    <property name="mnemonic_widget">seeing_text_size_combobox</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkComboBox" id="seeing_text_size_combobox">
-                                                    <property name="visible">True</property>
-                                                    <property name="model">text_size_model</property>
-                                                    <property name="active">0</property>
-                                                    <child>
-                                                      <object class="GtkCellRendererText" id="text_size_renderer"/>
-                                                      <attributes>
-                                                        <attribute name="scale">2</attribute>
-                                                        <attribute name="text">1</attribute>
-                                                      </attributes>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Contrast:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">seeing_contrast_combobox</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkHBox" id="hbox24">
+                                              <object class="GtkComboBox" id="seeing_contrast_combobox">
                                                 <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">Increase size:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="model">contrast_model</property>
+                                                <property name="active">1</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label4">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Shift+Ctrl+Alt+=</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
+                                                  <object class="GtkCellRendererText" id="contrast_renderer">
+                                                    <property name="font">Normal</property>
                                                   </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
+                                                  <attributes>
+                                                    <attribute name="scale">1</attribute>
+                                                    <attribute name="text">0</attribute>
+                                                  </attributes>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="seeing_text_size_box">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">12</property>
                                             <child>
-                                              <object class="GtkHBox" id="hbox25">
+                                              <object class="GtkLabel" id="seeing_text_size_label">
                                                 <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">Decrease size:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Text size:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="mnemonic_widget">seeing_text_size_combobox</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkComboBox" id="seeing_text_size_combobox">
+                                                <property name="visible">True</property>
+                                                <property name="model">text_size_model</property>
+                                                <property name="active">0</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label5">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Shift+Ctrl+Alt+-</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
+                                                  <object class="GtkCellRendererText" id="text_size_renderer"/>
+                                                  <attributes>
+                                                    <attribute name="scale">2</attribute>
+                                                    <attribute name="text">1</attribute>
+                                                  </attributes>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </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="GtkHBox" id="hbox24">
+                                            <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">Increase size:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label7">
+                                              <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label4">
                                                 <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Shift+Ctrl+Alt+=</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="position">0</property>
+                                            <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"></property>
                                           </packing>
                                         </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label18">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Display</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.500000"/>
-                                    </attributes>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkFrame" id="frame4">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment8">
-                                    <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
-                                    <child>
-                                      <object class="GtkVBox" id="vbox8">
-                                        <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table7">
+                                          <object class="GtkHBox" id="hbox25">
                                             <property name="visible">True</property>
-                                            <property name="n_rows">3</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="seeing_zoom_enabled_box">
+                                              <object class="GtkLabel" id="label6">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="seeing_zoom_on_radiobutton">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">seeing_zoom_off_radiobutton</property>
-                                                    <child>
-                                                      <object class="GtkLabel" id="label16">
-                                                        <property name="visible">True</property>
-                                                        <property name="label" translatable="yes">On</property>
-                                                        <attributes>
-                                                          <attribute name="scale" value="1.500000"/>
-                                                        </attributes>
-                                                      </object>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="seeing_zoom_off_radiobutton">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <child>
-                                                      <object class="GtkLabel" id="label19">
-                                                        <property name="visible">True</property>
-                                                        <property name="label" translatable="yes">Off</property>
-                                                        <attributes>
-                                                          <attribute name="scale" value="1.500000"/>
-                                                        </attributes>
-                                                      </object>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Decrease size:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkHBox" id="hbox20">
+                                              <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label5">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="label1">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Turn on or off:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Ctrl+Alt+8</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Shift+Ctrl+Alt+-</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label7">
+                                            <property name="visible">True</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>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label18">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Display</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="scale" value="1.250000"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame4">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment8">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <object class="GtkVBox" id="vbox8">
+                                    <property name="visible">True</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkTable" id="table7">
+                                        <property name="visible">True</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <child>
+                                          <object class="GtkHBox" id="seeing_zoom_enabled_box">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="hbox21">
+                                              <object class="GtkRadioButton" id="seeing_zoom_on_radiobutton">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_in_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Zoom in:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">seeing_zoom_off_radiobutton</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_in_keybinding_label">
+                                                  <object class="GtkLabel" id="label16">
                                                     <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Ctrl+Alt+=</property>
+                                                    <property name="label" translatable="yes">On</property>
                                                     <attributes>
                                                       <attribute name="scale" value="1.500000"/>
                                                     </attributes>
                                                   </object>
-                                                  <packing>
-                                                    <property name="position">1</property>
-                                                  </packing>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkHBox" id="hbox22">
+                                              <object class="GtkRadioButton" id="seeing_zoom_off_radiobutton">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_out_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Zoom out:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_out_keybinding_label">
+                                                  <object class="GtkLabel" id="label19">
                                                     <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Ctrl+Alt+-</property>
+                                                    <property name="label" translatable="yes">Off</property>
                                                     <attributes>
                                                       <attribute name="scale" value="1.500000"/>
                                                     </attributes>
                                                   </object>
-                                                  <packing>
-                                                    <property name="position">1</property>
-                                                  </packing>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label15">
-                                                <property name="visible">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox20">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkButton" id="seeing_zoom_preferences_button">
+                                              <object class="GtkLabel" id="label1">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_zoom_preferences_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="sensitive">False</property>
-                                                    <property name="label" translatable="yes">Options...</property>
-                                                    <property name="use_markup">True</property>
-                                                  </object>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Turn on or off:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label12">
+                                              <object class="GtkLabel" id="seeing_zoom_enable_keybinding_label">
                                                 <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Ctrl+Alt+8</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox21">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkLabel" id="label13">
+                                              <object class="GtkLabel" id="seeing_zoom_in_label">
                                                 <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Zoom in:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label14">
+                                              <object class="GtkLabel" id="seeing_zoom_in_keybinding_label">
                                                 <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Ctrl+Alt+=</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="position">0</property>
+                                            <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"></property>
                                           </packing>
                                         </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Zoom</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.500000"/>
-                                    </attributes>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkFrame" id="seeing_reader_frame">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment5">
-                                    <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
-                                    <child>
-                                      <object class="GtkVBox" id="vbox6">
-                                        <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table5">
+                                          <object class="GtkHBox" id="hbox22">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
-                                            <property name="row_spacing">12</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="seeing_reader_enabled_box">
+                                              <object class="GtkLabel" id="seeing_zoom_out_label">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="seeing_reader_on_radiobutton">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">seeing_reader_off_radiobutton</property>
-                                                    <child>
-                                                      <object class="GtkLabel" id="label23">
-                                                        <property name="visible">True</property>
-                                                        <property name="label" translatable="yes">On</property>
-                                                        <attributes>
-                                                          <attribute name="scale" value="1.500000"/>
-                                                        </attributes>
-                                                      </object>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="seeing_reader_off_radiobutton">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <child>
-                                                      <object class="GtkLabel" id="label20">
-                                                        <property name="visible">True</property>
-                                                        <property name="label" translatable="yes">Off</property>
-                                                        <attributes>
-                                                          <attribute name="scale" value="1.500000"/>
-                                                        </attributes>
-                                                      </object>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Zoom out:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkHBox" id="hbox11">
+                                              <object class="GtkLabel" id="seeing_zoom_out_keybinding_label">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="label9">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Turn on or off:</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_reader_enable_keybinding_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Ctrl+Alt+4</property>
-                                                    <attributes>
-                                                      <attribute name="scale" value="1.500000"/>
-                                                    </attributes>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Ctrl+Alt+-</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label15">
+                                            <property name="visible">True</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="GtkButton" id="seeing_zoom_preferences_button">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
                                             <child>
-                                              <object class="GtkButton" id="seeing_reader_preferences_button">
+                                              <object class="GtkLabel" id="seeing_zoom_preferences_label">
                                                 <property name="visible">True</property>
                                                 <property name="sensitive">False</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="use_underline">True</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="seeing_speech_preferences_label">
-                                                    <property name="visible">True</property>
-                                                    <property name="label" translatable="yes">Options...</property>
-                                                    <property name="use_markup">True</property>
-                                                  </object>
-                                                </child>
+                                                <property name="label" translatable="yes">Options...</property>
+                                                <property name="use_markup">True</property>
                                               </object>
-                                              <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="position">0</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label12">
+                                            <property name="visible">True</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="GtkLabel" id="label13">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label14">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label2">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Screen Reader</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.500000"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="seeing_enable_toggle_keys_checkbutton">
+                            <child type="label">
+                              <object class="GtkLabel" id="label8">
                                 <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>
-                                <child>
-                                  <object class="GtkLabel" id="seeing_enable_toggle_keys_label">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Beep when Caps and Num Lock are used</property>
-                                    <property name="use_markup">True</property>
-                                  </object>
-                                </child>
+                                <property name="label" translatable="yes">Zoom</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="scale" value="1.250000"/>
+                                </attributes>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">3</property>
-                              </packing>
                             </child>
                           </object>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="seeing_tab_label">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Seeing</property>
-                            <attributes>
-                              <attribute name="scale" value="1.000000"/>
-                            </attributes>
-                          </object>
                           <packing>
-                            <property name="tab_fill">False</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="hearing_vbox">
+                          <object class="GtkFrame" id="seeing_reader_frame">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">12</property>
+                            <property name="sensitive">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame11">
+                              <object class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment3">
+                                  <object class="GtkVBox" id="vbox6">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox4">
+                                      <object class="GtkTable" id="table5">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">12</property>
                                         <child>
-                                          <object class="GtkTable" id="table13">
+                                          <object class="GtkHBox" id="seeing_reader_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_rows">3</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="hearing_visual_alerts_enabled_box">
+                                              <object class="GtkRadioButton" id="seeing_reader_on_radiobutton">
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="hearing_visual_alerts_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">hearing_visual_alerts_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">seeing_reader_off_radiobutton</property>
                                                 <child>
-                                                  <object class="GtkRadioButton" id="hearing_visual_alerts_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
+                                                  <object class="GtkLabel" id="label23">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
+                                                    <property name="label" translatable="yes">On</property>
+                                                    <attributes>
+                                                      <attribute name="scale" value="1.500000"/>
+                                                    </attributes>
                                                   </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label31">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Use a visual indication when an alert sound occurs.</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkButton" id="hearing_test_flash_button">
-                                                <property name="label" translatable="yes">Test flash</property>
-                                                <property name="visible">True</property>
-                                                <property name="sensitive">False</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkRadioButton" id="hearing_flash_window_title_button">
-                                                <property name="label" translatable="yes">Flash the window title</property>
+                                              <object class="GtkRadioButton" id="seeing_reader_off_radiobutton">
                                                 <property name="visible">True</property>
-                                                <property name="sensitive">False</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="relief">none</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="label20">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes">Off</property>
+                                                    <attributes>
+                                                      <attribute name="scale" value="1.500000"/>
+                                                    </attributes>
+                                                  </object>
+                                                </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox11">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkRadioButton" id="hearing_flash_screen_button">
-                                                <property name="label" translatable="yes">Flash the entire screen</property>
+                                              <object class="GtkLabel" id="label9">
                                                 <property name="visible">True</property>
-                                                <property name="sensitive">False</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="draw_indicator">True</property>
-                                                <property name="group">hearing_flash_window_title_button</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Turn on or off:</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </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="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label40">
+                                              <object class="GtkLabel" id="seeing_reader_enable_keybinding_label">
                                                 <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">Ctrl+Alt+4</property>
+                                                <attributes>
+                                                  <attribute name="scale" value="1.500000"/>
+                                                </attributes>
                                               </object>
                                               <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="seeing_reader_preferences_button">
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_underline">True</property>
                                             <child>
-                                              <object class="GtkLabel" id="label41">
+                                              <object class="GtkLabel" id="seeing_speech_preferences_label">
                                                 <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Options...</property>
+                                                <property name="use_markup">True</property>
                                               </object>
-                                              <packing>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
-                                            <child>
-                                              <placeholder/>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label32">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Visual Alerts</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label2">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Screen Reader</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="scale" value="1.250000"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="seeing_enable_toggle_keys_checkbutton">
+                            <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>
+                            <child>
+                              <object class="GtkLabel" id="seeing_enable_toggle_keys_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Beep when Caps and Num Lock are used</property>
+                                <property name="use_markup">True</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="seeing_tab_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Seeing</property>
+                        <attributes>
+                          <attribute name="scale" value="1.000000"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="hearing_vbox">
+                        <property name="visible">True</property>
+                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkFrame" id="frame11">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame12">
+                              <object class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="yscale">0</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment2">
+                                  <object class="GtkVBox" id="vbox4">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox3">
+                                      <object class="GtkTable" id="table13">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
                                         <child>
-                                          <object class="GtkTable" id="table14">
+                                          <object class="GtkHBox" id="hearing_visual_alerts_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="column_spacing">24</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="hearing_captions_enabled_box">
+                                              <object class="GtkRadioButton" id="hearing_visual_alerts_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="hearing_captions_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">hearing_captions_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="hearing_captions_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">hearing_visual_alerts_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label35">
+                                              <object class="GtkRadioButton" id="hearing_visual_alerts_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Display a textual description of speech and sounds.</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label31">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Use a visual indication when an alert sound occurs</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="hearing_test_flash_button">
+                                            <property name="label" translatable="yes">Test flash</property>
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="hearing_flash_window_title_button">
+                                            <property name="label" translatable="yes">Flash the window title</property>
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="relief">none</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="hearing_flash_screen_button">
+                                            <property name="label" translatable="yes">Flash the entire screen</property>
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">hearing_flash_window_title_button</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="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label40">
+                                            <property name="visible">True</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="GtkLabel" id="label41">
+                                            <property name="visible">True</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="GtkLabel" id="label10">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label11">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label39">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Closed Captioning</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox5">
+                            <child type="label">
+                              <object class="GtkLabel" id="label32">
                                 <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkButton" id="hearing_sound_preferences_button">
-                                    <property name="label" translatable="yes">Sound Settings...</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="label" translatable="yes">Visual Alerts</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="hearing_tab_label">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Hearing</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                            <property name="tab_fill">False</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="typing_vbox">
+                          <object class="GtkFrame" id="frame12">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">12</property>
+                            <property name="sensitive">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame13">
+                              <object class="GtkAlignment" id="alignment2">
                                 <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="yscale">0</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment10">
+                                  <object class="GtkVBox" id="vbox3">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkTable" id="table4">
+                                      <object class="GtkTable" id="table14">
                                         <property name="visible">True</property>
-                                        <property name="n_columns">3</property>
+                                        <property name="n_columns">2</property>
                                         <property name="column_spacing">24</property>
                                         <child>
-                                          <object class="GtkLabel" id="label43">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Use an alternative form of text input</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkHBox" id="typing_assistant_enabled_box">
+                                          <object class="GtkHBox" id="hearing_captions_enabled_box">
                                             <property name="visible">True</property>
                                             <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkRadioButton" id="typing_assistant_on_radiobutton1">
+                                              <object class="GtkRadioButton" id="hearing_captions_on_radiobutton">
                                                 <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <property name="group">typing_assistant_off_radiobutton1</property>
+                                                <property name="group">hearing_captions_off_radiobutton</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -1252,11 +1163,12 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkRadioButton" id="typing_assistant_off_radiobutton1">
+                                              <object class="GtkRadioButton" id="hearing_captions_off_radiobutton">
                                                 <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
+                                                <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
@@ -1267,131 +1179,286 @@
                                           </object>
                                           <packing>
                                             <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkButton" id="typing_assistent_preferences_button">
+                                          <object class="GtkLabel" id="label35">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <child>
-                                              <object class="GtkLabel" id="seeing_zoom_preferences_label1">
-                                                <property name="visible">True</property>
-                                                <property name="sensitive">False</property>
-                                                <property name="label" translatable="yes">Options...</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                            </child>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Display a textual description of speech and sounds</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="right_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label42">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Typing Assistant</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label39">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Closed Captioning</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox5">
+                            <property name="visible">True</property>
                             <child>
-                              <object class="GtkCheckButton" id="typing_keyboard_toggle_checkbox">
-                                <property name="label" translatable="yes">Accessibility features can be turned on or off with keyboard shortcuts</property>
+                              <object class="GtkButton" id="hearing_sound_preferences_button">
+                                <property name="label" translatable="yes">Sound Settings...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="receives_default">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="position">1</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="hearing_tab_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Hearing</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="typing_vbox">
+                        <property name="visible">True</property>
+                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkFrame" id="frame13">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame2">
+                              <object class="GtkAlignment" id="alignment10">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment14">
+                                  <object class="GtkTable" id="table4">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="n_columns">3</property>
+                                    <property name="column_spacing">24</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label43">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Use an alternative form of text input</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
                                     <child>
-                                      <object class="GtkVBox" id="vbox10">
+                                      <object class="GtkHBox" id="typing_assistant_enabled_box">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table3">
+                                          <object class="GtkRadioButton" id="typing_assistant_on_radiobutton1">
+                                            <property name="label" translatable="yes">On</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">typing_assistant_off_radiobutton1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="typing_assistant_off_radiobutton1">
+                                            <property name="label" translatable="yes">Off</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="typing_assistent_preferences_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <child>
+                                          <object class="GtkLabel" id="seeing_zoom_preferences_label1">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="column_spacing">24</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="label" translatable="yes">Options...</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label42">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Typing Assistant</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </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="typing_keyboard_toggle_checkbox">
+                            <property name="label" translatable="yes">Turn on accessibility features from the keyboard</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</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="GtkFrame" id="frame2">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
+                            <child>
+                              <object class="GtkAlignment" id="alignment14">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <object class="GtkVBox" id="vbox10">
+                                    <property name="visible">True</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkTable" id="table3">
+                                        <property name="visible">True</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">2</property>
+                                        <child>
+                                          <object class="GtkHBox" id="typing_sticky_keys_enabled_box">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="typing_sticky_keys_enabled_box">
+                                              <object class="GtkRadioButton" id="typing_sticky_keys_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="typing_sticky_keys_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">typing_sticky_keys_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="typing_sticky_keys_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">typing_sticky_keys_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label4">
+                                              <object class="GtkRadioButton" id="typing_sticky_keys_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Treats a sequence of modifier keys as a key combination.</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label4">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Treats a sequence of modifier keys as a key combination</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1404,8 +1471,10 @@
                                             <property name="draw_indicator">True</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1418,100 +1487,130 @@
                                             <property name="draw_indicator">True</property>
                                           </object>
                                           <packing>
-                                            <property name="position">2</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label21">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label22">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label3">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Sticky Keys</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label3">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Sticky Keys</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame3">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame3">
+                              <object class="GtkAlignment" id="alignment15">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment15">
+                                  <object class="GtkVBox" id="vbox11">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox11">
+                                      <object class="GtkTable" id="table8">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">2</property>
                                         <child>
-                                          <object class="GtkTable" id="table8">
+                                          <object class="GtkHBox" id="typing_slow_keys_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="column_spacing">24</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="typing_slow_keys_enabled_box">
+                                              <object class="GtkRadioButton" id="typing_slow_keys_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="typing_slow_keys_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">typing_slow_keys_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="typing_slow_keys_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">typing_slow_keys_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label24">
+                                              <object class="GtkRadioButton" id="typing_slow_keys_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Puts a delay between when a key is pressed and when it is accepted.</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label24">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Puts a delay between when a key is pressed and when it is accepted</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1544,7 +1643,6 @@
                                                     <property name="xpad">10</property>
                                                     <property name="label" translatable="yes">Short</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -1577,7 +1675,6 @@
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Long</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -1594,8 +1691,10 @@
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1656,100 +1755,168 @@
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="position">2</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label44">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label45">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="typing_slow_keys_spacer_label">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label52">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label53">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label25">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Slow Keys</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">3</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label25">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Slow Keys</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame6">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame6">
+                              <object class="GtkAlignment" id="alignment12">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment12">
+                                  <object class="GtkVBox" id="vbox12">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox12">
+                                      <object class="GtkTable" id="table9">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">2</property>
                                         <child>
-                                          <object class="GtkTable" id="table9">
+                                          <object class="GtkHBox" id="typing_bounce_keys_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">2</property>
-                                            <property name="column_spacing">24</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="typing_bounce_keys_enabled_box">
+                                              <object class="GtkRadioButton" id="typing_bounce_keys_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="typing_bounce_keys_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">typing_bounce_keys_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="typing_bounce_keys_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">typing_bounce_keys_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="label27">
+                                              <object class="GtkRadioButton" id="typing_bounce_keys_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Ignores fast duplicate keypresses</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label27">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Ignores fast duplicate keypresses</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1782,7 +1949,6 @@
                                                     <property name="xpad">10</property>
                                                     <property name="label" translatable="yes">Short</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -1815,7 +1981,6 @@
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">Long</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -1832,7 +1997,10 @@
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="position">1</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1845,389 +2013,485 @@
                                             <property name="draw_indicator">True</property>
                                           </object>
                                           <packing>
-                                            <property name="position">2</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label46">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label47">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="typing_bounce_keys_spacer_label">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label55">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label56">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label29">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Bounce Keys</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label29">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Bounce Keys</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="typing_test_hbox">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkEntry" id="typing_test_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="text" translatable="yes">Type here to test settings</property>
+                                <accessibility>
+                                  <relation type="labelled-by" target="typing_test_label"/>
+                                </accessibility>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="position">4</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="typing_test_hbox">
+                              <object class="GtkButton" id="typing_keyboard_preferences_button">
+                                <property name="label" translatable="yes">Keyboard Settings...</property>
                                 <property name="visible">True</property>
-                                <property name="spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="typing_test_label">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Test:</property>
-                                    <accessibility>
-                                      <relation type="label-for" target="typing_test_entry"/>
-                                    </accessibility>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="typing_test_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x2022;</property>
-                                    <property name="text" translatable="yes">Type here to test settings</property>
-                                    <accessibility>
-                                      <relation type="labelled-by" target="typing_test_label"/>
-                                    </accessibility>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="typing_keyboard_preferences_button">
-                                    <property name="label" translatable="yes">Keyboard Settings...</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="pack_type">end</property>
-                                <property name="position">5</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="typing_tab_label">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Typing</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                            <property name="tab_fill">False</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="typing_tab_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Typing</property>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="pointing_and_clicking_vbox">
+                        <property name="visible">True</property>
+                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
                         <child>
-                          <object class="GtkVBox" id="pointing_and_clicking_vbox">
+                          <object class="GtkFrame" id="frame7">
                             <property name="visible">True</property>
-                            <property name="border_width">6</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">12</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame7">
+                              <object class="GtkAlignment" id="alignment13">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment13">
+                                  <object class="GtkVBox" id="vbox13">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox13">
+                                      <object class="GtkTable" id="table1">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table1">
+                                          <object class="GtkHBox" id="pointing_mouse_keys_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
-                                            <property name="row_spacing">6</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="pointing_mouse_keys_enabled_box">
+                                              <object class="GtkRadioButton" id="pointing_mouse_keys_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_mouse_keys_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">pointing_mouse_keys_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_mouse_keys_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">pointing_mouse_keys_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="pointing_mouse_keys_desc_label">
+                                              <object class="GtkRadioButton" id="pointing_mouse_keys_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Control the pointer using the keypad.</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkButton" id="pointing_mouse_keys_settings_button">
-                                                <property name="label" translatable="yes">Options...</property>
-                                                <property name="sensitive">False</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <signal name="activate" handler="show_mousekeys_preferences"/>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="pointing_mouse_keys_desc_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Control the pointer using the keypad</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="pointing_mouse_keys_settings_button">
+                                            <property name="label" translatable="yes">Options...</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <signal name="activate" handler="show_mousekeys_preferences"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label30">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Mouse Keys</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label30">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Mouse Keys</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame9">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame9">
+                              <object class="GtkAlignment" id="alignment11">
                                 <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment11">
+                                  <object class="GtkVBox" id="vbox14">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox14">
+                                      <object class="GtkTable" id="table11">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table11">
+                                          <object class="GtkHBox" id="pointing_video_mouse_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
-                                            <property name="row_spacing">6</property>
-                                            <child>
-                                              <object class="GtkHBox" id="pointing_video_mouse_enabled_box">
-                                                <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_video_mouse_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">pointing_video_mouse_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_video_mouse_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkLabel" id="pointing_video_mouse_desc_label">
+                                              <object class="GtkRadioButton" id="pointing_video_mouse_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Control the pointer using the video camera.</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">pointing_video_mouse_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkButton" id="pointing_video_mouse_settings_button">
-                                                <property name="label" translatable="yes">Options...</property>
+                                              <object class="GtkRadioButton" id="pointing_video_mouse_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="sensitive">False</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="pointing_video_mouse_desc_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Control the pointer using the video camera.</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="pointing_video_mouse_settings_button">
+                                            <property name="label" translatable="yes">Options...</property>
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label34">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Video Mouse</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label34">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Video Mouse</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame8">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame8">
+                              <object class="GtkAlignment" id="alignment4">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment4">
+                                  <object class="GtkVBox" id="vbox5">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox5">
+                                      <object class="GtkTable" id="table10">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_rows">2</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table10">
+                                          <object class="GtkHBox" id="pointing_second_click_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_rows">2</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
-                                            <property name="row_spacing">6</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkHBox" id="pointing_second_click_enabled_box">
+                                              <object class="GtkRadioButton" id="pointing_second_click_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_second_click_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">pointing_second_click_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_second_click_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">pointing_second_click_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" id="pointing_secondary_click_desc_label">
+                                              <object class="GtkRadioButton" id="pointing_second_click_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Trigger a secondary click by holding down the primary button.</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="pointing_secondary_click_desc_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Trigger a secondary click by holding down the primary button</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label28">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="pointing_secondary_click_spacer_label">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox1">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">12</property>
                                             <child>
                                               <object class="GtkLabel" id="pointing_secondary_click_delay_label">
                                                 <property name="visible">True</property>
@@ -2238,9 +2502,9 @@
                                                 <property name="mnemonic_widget">pointing_secondary_click_delay_scale</property>
                                               </object>
                                               <packing>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -2255,7 +2519,6 @@
                                                     <property name="yalign">0.4699999988079071</property>
                                                     <property name="label" translatable="yes" comments="short delay">Short</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -2289,7 +2552,6 @@
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes" comments="long delay">Long</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -2301,142 +2563,172 @@
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label28">
-                                                <property name="visible">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="pointing_secondary_click_spacer_label">
-                                                <property name="visible">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label48">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label33">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Simulated Secondary Click</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label33">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Simulated Secondary Click</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame10">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkFrame" id="frame10">
+                              <object class="GtkAlignment" id="alignment6">
                                 <property name="visible">True</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment6">
+                                  <object class="GtkVBox" id="vbox7">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">12</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">6</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox7">
+                                      <object class="GtkTable" id="table12">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">6</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">24</property>
+                                        <property name="row_spacing">6</property>
                                         <child>
-                                          <object class="GtkTable" id="table12">
+                                          <object class="GtkHBox" id="pointing_hover_click_enabled_box">
                                             <property name="visible">True</property>
-                                            <property name="n_rows">3</property>
-                                            <property name="n_columns">3</property>
-                                            <property name="column_spacing">24</property>
-                                            <property name="row_spacing">6</property>
-                                            <child>
-                                              <object class="GtkHBox" id="pointing_hover_click_enabled_box">
-                                                <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_hover_click_on_radiobutton">
-                                                    <property name="label" translatable="yes">On</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="active">True</property>
-                                                    <property name="draw_indicator">True</property>
-                                                    <property name="group">pointing_hover_click_off_radiobutton</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkRadioButton" id="pointing_hover_click_off_radiobutton">
-                                                    <property name="label" translatable="yes">Off</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="receives_default">False</property>
-                                                    <property name="draw_indicator">True</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkLabel" id="pointing_hover_click_desc_label">
+                                              <object class="GtkRadioButton" id="pointing_hover_click_on_radiobutton">
+                                                <property name="label" translatable="yes">On</property>
                                                 <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Trigger a click when the pointer hovers.</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">pointing_hover_click_off_radiobutton</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkButton" id="pointing_hover_click_settings_button">
-                                                <property name="label" translatable="yes">Options...</property>
+                                              <object class="GtkRadioButton" id="pointing_hover_click_off_radiobutton">
+                                                <property name="label" translatable="yes">Off</property>
                                                 <property name="visible">True</property>
-                                                <property name="sensitive">False</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="pointing_hover_click_desc_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Trigger a click when the pointer hovers</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="pointing_hover_click_settings_button">
+                                            <property name="label" translatable="yes">Options...</property>
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label37">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label38">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox2">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">12</property>
                                             <child>
                                               <object class="GtkLabel" id="pointing_dwell_delay_label">
                                                 <property name="visible">True</property>
@@ -2447,26 +2739,9 @@
                                                 <property name="mnemonic_widget">pointing_dwell_delay_scale</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">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="pointing_dwell_threshold_label">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Motion threshold:</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="justify">center</property>
-                                                <property name="mnemonic_widget">pointing_dwell_threshold_scale</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">GTK_FILL</property>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -2482,7 +2757,6 @@
                                                     <property name="label" translatable="yes" comments="short delay">Short</property>
                                                     <property name="justify">center</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -2511,7 +2785,6 @@
                                                     <property name="label" translatable="yes" comments="long delay">Long</property>
                                                     <property name="justify">center</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -2522,11 +2795,34 @@
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox3">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">12</property>
+                                            <child>
+                                              <object class="GtkLabel" id="pointing_dwell_threshold_label">
+                                                <property name="visible">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="label" translatable="yes">_Motion threshold:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="justify">center</property>
+                                                <property name="mnemonic_widget">pointing_dwell_threshold_scale</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -2542,7 +2838,6 @@
                                                     <property name="label" translatable="yes" comments="small threshold">Small</property>
                                                     <property name="justify">center</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -2571,7 +2866,6 @@
                                                     <property name="label" translatable="yes" comments="large threshold">Large</property>
                                                     <property name="justify">center</property>
                                                     <attributes>
-                                                      <attribute name="style" value="italic"/>
                                                       <attribute name="scale" value="0.830000"/>
                                                     </attributes>
                                                   </object>
@@ -2582,109 +2876,114 @@
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="right_attach">2</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label37">
-                                                <property name="visible">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="bottom_attach">2</property>
-                                                <property name="x_options">GTK_FILL</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label38">
-                                                <property name="visible">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="right_attach">3</property>
-                                                <property name="top_attach">2</property>
-                                                <property name="bottom_attach">3</property>
-                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="position">1</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label49">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label50">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label36">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Hover Click</property>
-                                    <property name="use_markup">True</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">3</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox13">
+                            <child type="label">
+                              <object class="GtkLabel" id="label36">
                                 <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkButton" id="pointing_mouse_preferences_button">
-                                    <property name="label" translatable="yes">Mouse Settings...</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="label" translatable="yes">Hover Click</property>
+                                <property name="use_markup">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">4</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="pointing_and_clicking_tab_label">
+                        <child>
+                          <object class="GtkHBox" id="hbox13">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Pointing and Clicking</property>
+                            <child>
+                              <object class="GtkButton" id="pointing_mouse_preferences_button">
+                                <property name="label" translatable="yes">Mouse Settings...</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="position">3</property>
-                            <property name="tab_fill">False</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="position">0</property>
+                        <property name="position">3</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="pointing_and_clicking_tab_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Pointing and Clicking</property>
+                      </object>
+                      <packing>
+                        <property name="position">3</property>
+                        <property name="tab_fill">False</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </object>
             </child>
@@ -2726,10 +3025,10 @@
   </object>
   <object class="GtkSizeGroup" id="seeing_sizegroup">
     <widgets>
-      <widget name="seeing_reader_enabled_box"/>
-      <widget name="seeing_zoom_enabled_box"/>
-      <widget name="seeing_text_size_box"/>
       <widget name="seeing_contrast_box"/>
+      <widget name="seeing_text_size_box"/>
+      <widget name="seeing_zoom_enabled_box"/>
+      <widget name="seeing_reader_enabled_box"/>
     </widgets>
   </object>
   <object class="GtkListStore" id="contrast_model">
@@ -2772,58 +3071,63 @@
   </object>
   <object class="GtkSizeGroup" id="typing_sizegroup">
     <widgets>
-      <widget name="typing_bouncekeys_delay_label"/>
-      <widget name="typing_bounce_keys_enabled_box"/>
-      <widget name="typing_slowkeys_delay_label"/>
-      <widget name="typing_slow_keys_enabled_box"/>
-      <widget name="typing_sticky_keys_enabled_box"/>
       <widget name="typing_assistant_enabled_box"/>
+      <widget name="typing_sticky_keys_enabled_box"/>
+      <widget name="typing_slow_keys_enabled_box"/>
+      <widget name="typing_slowkeys_delay_label"/>
+      <widget name="typing_bounce_keys_enabled_box"/>
+      <widget name="typing_bouncekeys_delay_label"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="pointing_sizegroup">
     <widgets>
-      <widget name="pointing_dwell_threshold_label"/>
-      <widget name="pointing_dwell_delay_label"/>
-      <widget name="pointing_hover_click_enabled_box"/>
-      <widget name="pointing_secondary_click_delay_label"/>
-      <widget name="pointing_second_click_enabled_box"/>
-      <widget name="pointing_video_mouse_enabled_box"/>
       <widget name="pointing_mouse_keys_enabled_box"/>
+      <widget name="pointing_video_mouse_enabled_box"/>
+      <widget name="pointing_second_click_enabled_box"/>
+      <widget name="pointing_secondary_click_delay_label"/>
+      <widget name="pointing_hover_click_enabled_box"/>
+      <widget name="pointing_dwell_delay_label"/>
+      <widget name="pointing_dwell_threshold_label"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="pointing_sizegroup2">
     <widgets>
-      <widget name="pointing_hover_click_threshold_scale_box"/>
-      <widget name="pointing_hover_click_delay_scale_box"/>
-      <widget name="pointing_hover_click_desc_label"/>
-      <widget name="pointing_secondary_click_scale_box"/>
-      <widget name="pointing_secondary_click_desc_label"/>
-      <widget name="pointing_video_mouse_desc_label"/>
       <widget name="pointing_mouse_keys_desc_label"/>
+      <widget name="pointing_video_mouse_desc_label"/>
+      <widget name="pointing_secondary_click_desc_label"/>
+      <widget name="pointing_secondary_click_scale_box"/>
+      <widget name="pointing_hover_click_desc_label"/>
+      <widget name="pointing_hover_click_delay_scale_box"/>
+      <widget name="pointing_hover_click_threshold_scale_box"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="pointing_scale_sizegroup">
+    <property name="ignore_hidden">True</property>
     <widgets>
-      <widget name="pointing_dwell_threshold_large_label"/>
-      <widget name="pointing_dwell_threshold_small_label"/>
-      <widget name="pointing_dwell_delay_long_label"/>
-      <widget name="pointing_dwell_delay_short_label"/>
-      <widget name="pointing_secondary_click_delay_long_label"/>
-      <widget name="pointing_secondary_click_delay_short_label"/>
+      <widget name="pointing_secondary_click_delay_scale"/>
+      <widget name="pointing_dwell_delay_scale"/>
+      <widget name="pointing_dwell_threshold_scale"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
-      <widget name="pointing_hover_click_settings_button"/>
-      <widget name="pointing_secondary_click_spacer_label"/>
-      <widget name="pointing_video_mouse_settings_button"/>
       <widget name="pointing_mouse_keys_settings_button"/>
+      <widget name="pointing_video_mouse_settings_button"/>
+      <widget name="pointing_secondary_click_spacer_label"/>
+      <widget name="pointing_hover_click_settings_button"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="hearing_sizegroup">
     <widgets>
-      <widget name="hearing_captions_enabled_box"/>
       <widget name="hearing_visual_alerts_enabled_box"/>
+      <widget name="hearing_captions_enabled_box"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="hover_click_sizegroup">
+    <widgets>
+      <widget name="pointing_secondary_click_delay_label"/>
+      <widget name="pointing_dwell_delay_label"/>
+      <widget name="pointing_dwell_threshold_label"/>
     </widgets>
   </object>
 </interface>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]