diff --git a/src/nautilus-bookmarks-window.ui b/src/nautilus-bookmarks-window.ui
index 3c5e47e..511a67e 100644
--- a/src/nautilus-bookmarks-window.ui
+++ b/src/nautilus-bookmarks-window.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
   <object class="GtkDialog" id="bookmarks_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Edit Bookmarks</property>
@@ -88,9 +89,9 @@
                     <child>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Bookmarks&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">_Bookmarks</property>
                         <property name="use_underline">True</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -99,6 +100,9 @@
                         <property name="xpad">0</property>
                         <property name="ypad">0</property>
                         <property name="mnemonic_widget">bookmark_tree_view</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -192,9 +196,9 @@
                         <child>
                           <object class="GtkLabel" id="bookmark_name_label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;_Name&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">_Name</property>
                             <property name="use_underline">True</property>
-                            <property name="use_markup">True</property>
+                            <property name="use_markup">False</property>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -202,6 +206,9 @@
                             <property name="yalign">0.5</property>
                             <property name="xpad">0</property>
                             <property name="ypad">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="padding">0</property>
@@ -271,9 +278,9 @@
                         <child>
                           <object class="GtkLabel" id="bookmark_location_label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;_Location&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">_Location</property>
                             <property name="use_underline">True</property>
-                            <property name="use_markup">True</property>
+                            <property name="use_markup">False</property>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -281,6 +288,9 @@
                             <property name="yalign">0.5</property>
                             <property name="xpad">2</property>
                             <property name="ypad">2</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="padding">0</property>
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index eae16d1..fda0cb9 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
   <object class="GtkListStore" id="model1">
     <columns>
       <column type="gchararray"/>
@@ -329,9 +330,9 @@
                     <child>
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Default View</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -343,6 +344,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -538,9 +542,9 @@
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Icon View Defaults</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -552,6 +556,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -691,9 +698,9 @@
                     <child>
                       <object class="GtkLabel" id="label">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Compact View Defaults&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Compact View Defaults</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -705,6 +712,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -826,9 +836,9 @@
                     <child>
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">List View Defaults</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -840,6 +850,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -943,9 +956,9 @@
                     <child>
                       <object class="GtkLabel" id="label25">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Tree View Defaults</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -957,6 +970,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1053,9 +1069,9 @@
                     <child>
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Behavior</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1067,6 +1083,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1194,9 +1213,9 @@
                     <child>
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Executable Text Files</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1208,6 +1227,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1311,9 +1333,9 @@
                     <child>
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Trash</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1325,6 +1347,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1439,9 +1464,9 @@
                     <child>
                       <object class="GtkLabel" id="label28">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Icon Captions</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1453,6 +1478,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1689,9 +1717,9 @@
                     <child>
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Date</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1703,6 +1731,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1825,9 +1856,9 @@
                     <child>
                       <object class="GtkLabel" id="label31">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">List Columns</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1839,6 +1870,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -1944,9 +1978,9 @@
                     <child>
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Text Files</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -1958,6 +1992,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -2061,9 +2098,9 @@
                     <child>
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Other Previewable Files</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -2075,6 +2112,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -2234,9 +2274,9 @@
                     <child>
                       <object class="GtkLabel" id="label20">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Sound Files</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -2248,6 +2288,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -2351,9 +2394,9 @@
                     <child>
                       <object class="GtkLabel" id="label22">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">Folders</property>
                         <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">False</property>
                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                         <property name="wrap">False</property>
                         <property name="selectable">False</property>
@@ -2365,6 +2408,9 @@
                         <property name="width_chars">-1</property>
                         <property name="single_line_mode">False</property>
                         <property name="angle">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="padding">0</property>
@@ -2504,9 +2550,9 @@
                         <child>
                           <object class="GtkLabel" id="label42">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">Media Handling</property>
                             <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
+                            <property name="use_markup">False</property>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -2518,6 +2564,9 @@
                             <property name="width_chars">-1</property>
                             <property name="single_line_mode">False</property>
                             <property name="angle">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="padding">0</property>
@@ -2818,9 +2867,9 @@
                         <child>
                           <object class="GtkLabel" id="label61">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">Other Media</property>
                             <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
+                            <property name="use_markup">False</property>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -2832,6 +2881,9 @@
                             <property name="width_chars">-1</property>
                             <property name="single_line_mode">False</property>
                             <property name="angle">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="padding">0</property>
