diff --git a/src/preferences.ui b/src/preferences.ui
index cdccdc25..a6b4e36e 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -217,11 +217,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="keybindings">
+              <object class="GtkGrid" id="keybindings">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="n_rows">2</property>
                 <property name="column_spacing">12</property>
                 <property name="row_spacing">6</property>
                 <child>
@@ -236,7 +235,8 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="top_attach">0</property>
+                    <property name="left_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -245,6 +245,8 @@
                     <property name="can_focus">True</property>
                     <property name="hscrollbar_policy">never</property>
                     <property name="shadow_type">in</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <child>
                       <object class="GtkTreeView" id="accelerators-treeview">
                         <property name="visible">True</property>
@@ -258,7 +260,7 @@
                   </object>
                   <packing>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">0</property>
                   </packing>
                 </child>
               </object>
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index d2f2e2e9..23a9b2af 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -222,25 +222,11 @@
                 <property name="border_width">12</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkTable" id="general-table">
+                  <object class="GtkGrid" id="general-table">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">11</property>
-                    <property name="n_columns">4</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
-                    <child>
-                      <object class="GtkEntry" id="profile-name-entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">4</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkLabel" id="profile-name-label">
                         <property name="visible">True</property>
@@ -252,8 +238,20 @@
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="top_attach">0</property>
+                        <property name="left_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="profile-name-entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">•</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">0</property>
+                        <property name="left_attach">1</property>
+                        <property name="width">3</property>
                       </packing>
                     </child>
                     <child>
@@ -265,8 +263,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -277,11 +274,9 @@
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="width">3</property>
                       </packing>
                     </child>
                     <child>
@@ -295,8 +290,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -331,12 +325,8 @@
                         </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">GTK_FILL</property>
+                        <property name="left_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -371,12 +361,34 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="top_attach">2</property>
                         <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButtonBox" id="buttonbox1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="layout_style">end</property>
+                        <child>
+                          <object class="GtkButton" id="default-size-reset-button">
+                            <property name="label" translatable="yes">Rese_t</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_underline">True</property>
+                            <property name="focus_on_click">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </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="left_attach">3</property>
                       </packing>
                     </child>
                     <child>
@@ -390,8 +402,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -408,12 +419,9 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="width">3</property>
                       </packing>
                     </child>
                     <child>
@@ -427,8 +435,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -445,12 +452,9 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="width">3</property>
                       </packing>
                     </child>
                     <child>
@@ -464,10 +468,9 @@
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
+                        <property name="width">4</property>
                       </packing>
                     </child>
                     <child>
@@ -482,10 +485,9 @@
                         </attributes>
                       </object>
                       <packing>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
+                        <property name="width">4</property>
                       </packing>
                     </child>
                     <child>
@@ -500,8 +502,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -518,12 +519,9 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="width">3</property>
                       </packing>
                     </child>
                     <child>
@@ -538,10 +536,9 @@
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
+                        <property name="width">4</property>
                       </packing>
                     </child>
                     <child>
@@ -557,8 +554,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -571,41 +567,9 @@
                         <property name="title" translatable="yes">Choose A Terminal Font</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButtonBox" id="buttonbox1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="layout_style">end</property>
-                        <child>
-                          <object class="GtkButton" id="default-size-reset-button">
-                            <property name="label" translatable="yes">Rese_t</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">3</property>
-                        <property name="right_attach">4</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="width">3</property>
                       </packing>
                     </child>
                     <child>
@@ -620,8 +584,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -656,12 +619,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -696,12 +655,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
                         <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -726,11 +681,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">3</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">3</property>
                       </packing>
                     </child>
                   </object>
@@ -1317,11 +1269,9 @@
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkTable" id="table25">
+                              <object class="GtkGrid" id="table25">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="n_rows">3</property>
-                                <property name="n_columns">2</property>
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">6</property>
                                 <child>
@@ -1334,19 +1284,49 @@
                                     <property name="mnemonic_widget">palette-combobox</property>
                                     <property name="xalign">0</property>
                                   </object>
+                                  <packing>
+                                    <property name="top_attach">0</property>
+                                    <property name="left_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="palette-combobox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="model">model4</property>
+                                    <property name="focus_on_click">False</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer4"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">0</property>
+                                    <property name="left_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label43">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">Color p_alette:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="mnemonic_widget">palette-colorpicker-0</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0</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 name="left_attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkTable" id="palette-table">
+                                  <object class="GtkGrid" id="palette-table">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="n_rows">2</property>
-                                    <property name="n_columns">8</property>
                                     <property name="column_spacing">6</property>
                                     <property name="row_spacing">6</property>
                                     <child>
@@ -1357,8 +1337,8 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="top_attach">0</property>
+                                        <property name="left_attach">0</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1369,10 +1349,8 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1383,10 +1361,8 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">2</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1397,10 +1373,8 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">3</property>
-                                        <property name="right_attach">4</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1411,10 +1385,8 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">4</property>
-                                        <property name="right_attach">5</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1425,70 +1397,56 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">5</property>
-                                        <property name="right_attach">6</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-7">
+                                      <object class="GtkColorButton" id="palette-colorpicker-6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">7</property>
-                                        <property name="right_attach">8</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="top_attach">0</property>
+                                        <property name="left_attach">6</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-8">
+                                      <object class="GtkColorButton" id="palette-colorpicker-7">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="top_attach">0</property>
+                                        <property name="left_attach">7</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-9">
+                                      <object class="GtkColorButton" id="palette-colorpicker-8">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="left_attach">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-11">
+                                      <object class="GtkColorButton" id="palette-colorpicker-9">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">3</property>
-                                        <property name="right_attach">4</property>
                                         <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="left_attach">1</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1499,44 +1457,32 @@
                                         <property name="tooltip_text">dummy</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 name="y_options"/>
+                                        <property name="left_attach">2</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-12">
+                                      <object class="GtkColorButton" id="palette-colorpicker-11">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">4</property>
-                                        <property name="right_attach">5</property>
                                         <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="left_attach">3</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-15">
+                                      <object class="GtkColorButton" id="palette-colorpicker-12">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">7</property>
-                                        <property name="right_attach">8</property>
                                         <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
+                                        <property name="left_attach">4</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1547,110 +1493,38 @@
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">5</property>
-                                        <property name="right_attach">6</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 name="left_attach">5</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-6">
+                                      <object class="GtkColorButton" id="palette-colorpicker-14">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
+                                        <property name="top_attach">1</property>
                                         <property name="left_attach">6</property>
-                                        <property name="right_attach">7</property>
-                                        <property name="x_options"/>
-                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkColorButton" id="palette-colorpicker-14">
+                                      <object class="GtkColorButton" id="palette-colorpicker-15">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="tooltip_text">dummy</property>
                                       </object>
                                       <packing>
-                                        <property name="left_attach">6</property>
-                                        <property name="right_attach">7</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 name="left_attach">7</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">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label44">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Terminal applications have these colors available to them.</property>
-                                    <property name="justify">center</property>
-                                    <property name="xalign">0</property>
-                                    <attributes>
-                                      <attribute name="style" value="italic"/>
-                                      <attribute name="size" value="0"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"/>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label43">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Color p_alette:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="justify">center</property>
-                                    <property name="mnemonic_widget">palette-colorpicker-0</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0</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>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="palette-combobox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="model">model4</property>
-                                    <property name="focus_on_click">False</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="renderer4"/>
-                                      <attributes>
-                                        <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="y_options">GTK_FILL</property>
+                                    <property name="left_attach">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -1711,30 +1585,27 @@
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="table27">
+              <object class="GtkGrid" id="table27">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="n_rows">4</property>
-                <property name="n_columns">2</property>
                 <property name="column_spacing">12</property>
                 <property name="row_spacing">6</property>
                 <child>
-                  <object class="GtkCheckButton" id="scroll-on-keystroke-checkbutton">
-                    <property name="label" translatable="yes">Scroll on _keystroke</property>
+                  <object class="GtkCheckButton" id="scrollbar-checkbutton">
+                    <property name="label" translatable="yes">_Show scrollbar</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0.5</property>
                     <property name="draw_indicator">True</property>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+                    <property name="top_attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -1746,13 +1617,29 @@
                     <property name="use_underline">True</property>
                     <property name="xalign">0.5</property>
                     <property name="draw_indicator">True</property>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+                    <property name="left_attach">0</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="scroll-on-keystroke-checkbutton">
+                    <property name="label" translatable="yes">Scroll on _keystroke</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
@@ -1764,12 +1651,11 @@
                     <property name="use_underline">True</property>
                     <property name="xalign">0.5</property>
                     <property name="draw_indicator">True</property>
+                    <property name="hexpand">False</property>
                   </object>
                   <packing>
                     <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+                    <property name="left_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1777,6 +1663,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
+                    <property name="hexpand">True</property>
                     <child>
                       <object class="GtkSpinButton" id="scrollback-lines-spinbutton">
                         <property name="visible">True</property>
@@ -1808,27 +1695,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="y_options">GTK_SHRINK | GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="scrollbar-checkbutton">
-                    <property name="label" translatable="yes">_Show scrollbar</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">2</property>
-                    <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="left_attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -1874,30 +1742,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkTable" id="table30">
+                  <object class="GtkGrid" id="table30">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">4</property>
-                    <property name="n_columns">3</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="delete-binding-combobox-label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Delete key generates:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">center</property>
-                        <property name="mnemonic_widget">delete-binding-combobox</property>
-                        <property name="xalign">0</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"/>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkLabel" id="backspace-binding-combobox-label">
                         <property name="visible">True</property>
@@ -1909,8 +1758,8 @@
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="top_attach">0</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1927,10 +1776,23 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="top_attach">0</property>
                         <property name="left_attach">1</property>
-                        <property name="right_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="delete-binding-combobox-label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Delete key generates:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">center</property>
+                        <property name="mnemonic_widget">delete-binding-combobox</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1947,12 +1809,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">3</property>
                         <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1965,9 +1823,7 @@
                       </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 name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1977,12 +1833,8 @@
                         <property name="focus_on_click">False</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</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">GTK_FILL</property>
+                        <property name="left_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1997,9 +1849,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -2017,12 +1867,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">3</property>
                         <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
                       </packing>
                     </child>
                   </object>
