diff --git a/gok-editor.ui b/gok-editor.ui
index 26b5f69..498d5b5 100644
--- a/gok-editor.ui
+++ b/gok-editor.ui
@@ -186,8 +186,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label38">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Keyboard&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Keyboard</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
@@ -608,8 +610,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label41">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Appearance&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Appearance</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -776,8 +780,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label42">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Position&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Position</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -934,8 +940,10 @@
                                         <child type="label">
                                           <object class="GtkLabel" id="label53">
                                             <property name="visible">True</property>
-                                            <property name="label" translatable="yes">&lt;b&gt;Modifier&lt;/b&gt;</property>
-                                            <property name="use_markup">True</property>
+                                            <property name="label" translatable="yes">Modifier</property>
+                                            <attributes>
+                                              <attribute name="weight" value="bold"/>
+                                            </attributes>
                                           </object>
                                         </child>
                                       </object>
@@ -979,8 +987,10 @@
                                         <child type="label">
                                           <object class="GtkLabel" id="label54">
                                             <property name="visible">True</property>
-                                            <property name="label" translatable="yes">&lt;b&gt;Branch&lt;/b&gt;</property>
-                                            <property name="use_markup">True</property>
+                                            <property name="label" translatable="yes">Branch</property>
+                                            <attributes>
+                                              <attribute name="weight" value="bold"/>
+                                            </attributes>
                                           </object>
                                         </child>
                                       </object>
@@ -998,8 +1008,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label43">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Type&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Type</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1574,8 +1586,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label44">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Output&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Output</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1648,8 +1662,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label45">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Font</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1667,8 +1683,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label39">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Key&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Key</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
diff --git a/gok-settingsdialog.ui b/gok-settingsdialog.ui
index 77128ff..f9c61ec 100644
--- a/gok-settingsdialog.ui
+++ b/gok-settingsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">60</property>
@@ -257,8 +257,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Key Size and Spacing Controls&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Key Size and Spacing Controls</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -284,8 +286,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Preview</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -396,8 +400,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label120">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Dock and Expand Horizontally&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Dock and Expand Horizontally</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -438,8 +444,12 @@
                         <child>
                           <object class="GtkLabel" id="label99">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;&lt;b&gt;Note:&lt;/b&gt; Changes to this setting will not take effect until you next run GOK.&lt;/i&gt;&lt;/small&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Changes to this setting will not take effect until you next run GOK.</property>
                             <property name="use_markup">True</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.8"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -452,8 +462,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Theme&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Theme</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -590,8 +602,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="ComposeKeyboardFrameLabel">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Compose Keyboard&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Compose Keyboard</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -666,8 +680,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label127">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Custom Keyboards&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Custom Keyboards</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -801,8 +817,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label92">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Define Actions&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Define Actions</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -1021,8 +1039,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label87">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Switch or Button Number&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Switch or Button Number</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1086,8 +1106,10 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="label88">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Behavior</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
                                   </object>
                                 </child>
                               </object>
@@ -1153,8 +1175,10 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="label897">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;Delay Before Activation&lt;/b&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="label" translatable="yes">Delay Before Activation</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
                                   </object>
                                 </child>
                               </object>
@@ -1258,8 +1282,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label95">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Valuator Type&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Valuator Type</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1334,8 +1360,10 @@
                             <child type="label">
                               <object class="GtkLabel" id="label97">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Timers and Delays&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Timers and Delays</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1412,8 +1440,10 @@
                               <object class="GtkLabel" id="label96">
                                 <property name="visible">True</property>
                                 <property name="can_default">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Behavior</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1488,8 +1518,10 @@
                               <object class="GtkLabel" id="SensitivityLabel">
                                 <property name="visible">True</property>
                                 <property name="can_default">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Sensitivity&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Sensitivity</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
                               </object>
                             </child>
                           </object>
@@ -1612,8 +1644,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label91">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Event Source&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Event Source</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -1749,8 +1783,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label100">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Define Feedback&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Define Feedback</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                         <accessibility>
                           <relation type="labelled-by" target="label100"/>
                           <relation type="label-for" target="comboFeedback"/>
@@ -1839,8 +1875,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Key Flashing&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Key Flashing</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -1936,8 +1974,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label28">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Sound&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Sound</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -1979,8 +2019,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="SpeechFeedbackLabel">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Speech&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Speech</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
@@ -2069,8 +2111,10 @@
                         <child type="label">
                           <object class="GtkLabel" id="label31">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Description&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Description</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                         </child>
                       </object>
@@ -2235,8 +2279,10 @@
                     <child type="label">
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Word Completion&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Word Completion</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
