diff --git a/plugins/search/anjuta-search.ui b/plugins/search/anjuta-search.ui
index 4201694..c167735 100644
--- a/plugins/search/anjuta-search.ui
+++ b/plugins/search/anjuta-search.ui
@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">400</property>
+    <property name="value">100</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">400</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">100</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -21,52 +22,55 @@
   </object>
   <object class="GtkListStore" id="model2">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0" translatable="no">CVS</col>
+        <col id="0">CVS</col>
       </row>
       <row>
-        <col id="0" translatable="no">CVS intl po </col>
+        <col id="0">CVS intl po </col>
       </row>
     </data>
   </object>
   <object class="GtkListStore" id="model3">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0" translatable="no">*.so *.o *.a *.la</col>
+        <col id="0">*.so *.o *.a *.la</col>
       </row>
     </data>
   </object>
   <object class="GtkListStore" id="model4">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0" translatable="no">*\.*</col>
+        <col id="0">*\.*</col>
       </row>
       <row>
-        <col id="0" translatable="no">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
+        <col id="0">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
       </row>
       <row>
-        <col id="0" translatable="no">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
+        <col id="0">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
       </row>
     </data>
   </object>
   <object class="GtkWindow" id="dialog.search.replace">
     <property name="title" translatable="yes">Find &amp; Replace</property>
-    <signal after="yes" handler="on_search_dialog_key_press_event" name="key_press_event" object="dialog.search.replace"/>
-    <signal handler="on_search_replace_delete_event" name="delete_event"/>
+    <signal name="key_press_event" handler="on_search_dialog_key_press_event" object="dialog.search.replace" after="yes"/>
+    <signal name="delete_event" handler="on_search_replace_delete_event"/>
     <child>
       <object class="GtkFrame" id="frame9">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_NONE</property>
+        <property name="shadow_type">none</property>
         <child>
           <object class="GtkVBox" id="vbox10">
             <property name="visible">True</property>
@@ -74,7 +78,7 @@
               <object class="GtkFrame" id="frame10">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkNotebook" id="search.notebook">
                     <property name="visible">True</property>
@@ -84,19 +88,18 @@
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkTable" id="table3">
                             <property name="visible">True</property>
                             <property name="n_rows">3</property>
-                            <property name="n_columns">1</property>
                             <property name="column_spacing">10</property>
                             <property name="row_spacing">7</property>
                             <child>
                               <object class="GtkFrame" id="frame50">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkTable" id="table30">
                                     <property name="visible">True</property>
@@ -105,13 +108,11 @@
                                     <property name="n_columns">3</property>
                                     <property name="row_spacing">5</property>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
                                       <object class="GtkCheckButton" id="replace.regex">
+                                        <property name="label" translatable="yes">Expand regex back references</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Expand regex back references</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -120,24 +121,20 @@
                                         <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="y_options"></property>
                                         <property name="x_padding">4</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxEntry" id="replace.string.combo">
                                         <property name="visible">True</property>
-                                        <child internal-child="entry">
-                                          <object class="GtkEntry" id="comboboxentry-entry2">
-                                          </object>
-                                        </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="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -146,27 +143,23 @@
                                         <property name="xalign">0</property>
                                         <property name="xpad">5</property>
                                         <property name="label" translatable="yes">Replace With:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</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="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxEntry" id="search.string.combo">
                                         <property name="visible">True</property>
-                                        <child internal-child="entry">
-                                          <object class="GtkEntry" id="comboboxentry-entry1">
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -174,14 +167,17 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="xpad">5</property>
-                                        <property comments="This is &quot;the search expression&quot; (noun)" name="label" translatable="yes">Search Expression:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="label" translatable="yes" comments="This is &quot;the search expression&quot; (noun)">Search Expression:</property>
+                                        <property name="justify">center</property>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </object>
                                 </child>
                                 <child type="label">
@@ -201,7 +197,7 @@
                               <object class="GtkFrame" id="frame.search.basic">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox1127">
                                     <property name="visible">True</property>
@@ -209,27 +205,30 @@
                                     <property name="spacing">20</property>
                                     <child>
                                       <object class="GtkRadioButton" id="search.full_buffer">
+                                        <property name="label" translatable="yes">Full Buffer</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Full Buffer</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="on_search_full_buffer_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_full_buffer_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="search.forward">
+                                        <property name="label" translatable="yes">Forward</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Forward</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">search.full_buffer</property>
-                                        <signal handler="on_search_forward_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_forward_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -239,13 +238,14 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="search.backward">
+                                        <property name="label" translatable="yes">Backward</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Backward</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">search.full_buffer</property>
-                                        <signal handler="on_search_backward_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_backward_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -273,7 +273,7 @@
                               <object class="GtkFrame" id="frame51">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkTable" id="table31">
                                     <property name="visible">True</property>
@@ -282,12 +282,13 @@
                                     <property name="n_columns">2</property>
                                     <child>
                                       <object class="GtkCheckButton" id="search.match.word.start">
+                                        <property name="label" translatable="yes">Match at start of word</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Match at start of word</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="on_search_match_word_start_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_match_word_start_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -295,18 +296,19 @@
                                         <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="y_options"></property>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="search.match.whole.line">
+                                        <property name="label" translatable="yes">Match complete lines</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Match complete lines</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="on_search_match_whole_line_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_match_whole_line_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -314,15 +316,16 @@
                                         <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="y_options"></property>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="search.greedy">
+                                        <property name="label" translatable="yes">Greedy matching</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Greedy matching</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -330,32 +333,34 @@
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="search.match.whole.word">
+                                        <property name="label" translatable="yes">Match complete words</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Match complete words</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="on_search_match_whole_word_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_match_whole_word_toggled"/>
                                       </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="y_options"></property>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="search.match.case">
+                                        <property name="label" translatable="yes">Match case</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Match case</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -363,22 +368,23 @@
                                         <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="y_options"></property>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="search.regex">
+                                        <property name="label" translatable="yes">Regular expression</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Regular expression</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="on_search_regex_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="on_search_regex_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="x_padding">5</property>
                                       </packing>
                                     </child>
@@ -405,8 +411,8 @@
                     <child type="tab">
                       <object class="GtkLabel" id="search.expression.tab">
                         <property name="visible">True</property>
-                        <property comments="This is &quot;the search expression&quot; (noun)" name="label" translatable="yes">Search Expression</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                        <property name="label" translatable="yes" comments="This is &quot;the search expression&quot; (noun)">Search Expression</property>
+                        <property name="justify">center</property>
                       </object>
                       <packing>
                         <property name="tab_fill">False</property>
@@ -417,7 +423,7 @@
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkTable" id="table4">
                             <property name="visible">True</property>
@@ -427,7 +433,7 @@
                               <object class="GtkFrame" id="frame60">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkTable" id="table33">
                                     <property name="visible">True</property>
@@ -443,7 +449,7 @@
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -455,7 +461,7 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -463,13 +469,13 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Search Direction:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</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="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -477,11 +483,11 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Search In:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</property>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                   </object>
@@ -503,7 +509,7 @@
                               <object class="GtkFrame" id="frame56">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkTable" id="table32">
                                     <property name="visible">True</property>
@@ -525,16 +531,18 @@
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkCheckButton" id="actions.no_limit">
+                                            <property name="label" translatable="yes">No Limit</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="label" translatable="yes">No Limit</property>
+                                            <property name="receives_default">False</property>
                                             <property name="use_underline">True</property>
                                             <property name="draw_indicator">True</property>
-                                            <signal handler="on_actions_no_limit_clicked" name="clicked"/>
+                                            <signal name="clicked" handler="on_actions_no_limit_clicked"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -557,13 +565,13 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Maximum Actions</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</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="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -573,7 +581,7 @@
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -581,11 +589,11 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Search Action:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</property>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                   </object>
@@ -608,14 +616,10 @@
                             <child>
                               <object class="GtkFrame" id="frame.search.var">
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkComboBoxEntry" id="search.var.combo">
                                     <property name="visible">True</property>
-                                    <child internal-child="entry">
-                                      <object class="GtkEntry" id="comboboxentry-entry7">
-                                      </object>
-                                    </child>
                                     <property name="model">model1</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="renderer1"/>
@@ -628,7 +632,7 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="label41">
                                     <property name="visible">True</property>
-                                    <property comments="User can select variables that contain lists of files, so this is a combined noun" name="label" translatable="yes">&lt;b&gt;Search variable&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes" comments="User can select variables that contain lists of files, so this is a combined noun">&lt;b&gt;Search variable&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
                                   </object>
                                 </child>
@@ -643,7 +647,7 @@
                             <child>
                               <object class="GtkFrame" id="frame.file.filter">
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkTable" id="table5">
                                     <property name="visible">True</property>
@@ -655,10 +659,6 @@
                                     <child>
                                       <object class="GtkComboBoxEntry" id="dir.filter.unmatch.combo">
                                         <property name="visible">True</property>
-                                        <child internal-child="entry">
-                                          <object class="GtkEntry" id="comboboxentry-entry6">
-                                          </object>
-                                        </child>
                                         <property name="model">model2</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="renderer2"/>
@@ -672,32 +672,24 @@
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxEntry" id="dir.filter.match.combo">
                                         <property name="visible">True</property>
-                                        <child internal-child="entry">
-                                          <object class="GtkEntry" id="comboboxentry-entry5">
-                                          </object>
-                                        </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="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxEntry" id="file.filter.unmatch.combo">
                                         <property name="visible">True</property>
-                                        <child internal-child="entry">
-                                          <object class="GtkEntry" id="comboboxentry-entry4">
-                                          </object>
-                                        </child>
                                         <property name="model">model3</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="renderer3"/>
@@ -711,16 +703,12 @@
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxEntry" id="file.filter.match.combo">
                                         <property name="visible">True</property>
-                                        <child internal-child="entry">
-                                          <object class="GtkEntry" id="comboboxentry-entry3">
-                                          </object>
-                                        </child>
                                         <property name="model">model4</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="renderer4"/>
@@ -732,14 +720,15 @@
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">3</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="ignore.binary.files">
+                                        <property name="label" translatable="yes">Ignore Binary Files</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Ignore Binary Files</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -748,14 +737,15 @@
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="search.dir.recursive">
+                                        <property name="label" translatable="yes">Search Recursively</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Search Recursively</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -764,14 +754,15 @@
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="ignore.hidden.dirs">
+                                        <property name="label" translatable="yes">Ignore Hidden Directories</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Ignore Hidden Directories</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -779,7 +770,7 @@
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -787,13 +778,13 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Ignore Directories:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -801,20 +792,21 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Choose Directories:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="ignore.hidden.files">
+                                        <property name="label" translatable="yes">Ignore Hidden Files</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Ignore Hidden Files</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -822,7 +814,7 @@
                                         <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="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -830,13 +822,13 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Ignore Files:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</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="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -844,11 +836,11 @@
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Choose Files:</property>
-                                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                        <property name="justify">center</property>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                   </object>
@@ -871,12 +863,15 @@
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="search.target.tab">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Search Target</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                        <property name="justify">center</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -887,7 +882,7 @@
                       <object class="GtkFrame" id="frame.setting">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkVBox" id="vbox1124">
                             <property name="visible">True</property>
@@ -897,21 +892,23 @@
                                 <property name="visible">True</property>
                                 <property name="border_width">3</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkCheckButton" id="search.basic">
+                                    <property name="label" translatable="yes">Basic Search &amp; Replace</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="label" translatable="yes">Basic Search &amp; Replace</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="on_setting_basic_search_toggled" name="toggled"/>
+                                    <signal name="toggled" handler="on_setting_basic_search_toggled"/>
                                   </object>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -919,7 +916,7 @@
                                 <property name="visible">True</property>
                                 <property name="border_width">3</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox1126">
                                     <property name="visible">True</property>
@@ -933,9 +930,9 @@
                                             <property name="height_request">100</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                                            <property name="hscrollbar_policy">automatic</property>
+                                            <property name="vscrollbar_policy">automatic</property>
+                                            <property name="shadow_type">in</property>
                                             <child>
                                               <object class="GtkTreeView" id="setting.pref.treeview">
                                                 <property name="visible">True</property>
@@ -943,6 +940,9 @@
                                               </object>
                                             </child>
                                           </object>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkVBox" id="vbox1125">
@@ -958,13 +958,13 @@
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
                                                 <property name="padding">5</property>
+                                                <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkEntry" id="setting.pref.entry">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="invisible_char">*</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -980,6 +980,9 @@
                                           </packing>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox1129">
@@ -989,22 +992,27 @@
                                         <property name="homogeneous">True</property>
                                         <child>
                                           <object class="GtkButton" id="setting.pref.add">
+                                            <property name="label">gtk-add</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="can_default">True</property>
-                                            <property name="label">gtk-add</property>
+                                            <property name="receives_default">False</property>
                                             <property name="use_stock">True</property>
-                                            <signal handler="on_setting_pref_add_clicked" name="clicked"/>
+                                            <signal name="clicked" handler="on_setting_pref_add_clicked"/>
                                           </object>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="setting.pref.remove">
+                                            <property name="label">gtk-remove</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="can_default">True</property>
-                                            <property name="label">gtk-remove</property>
+                                            <property name="receives_default">False</property>
                                             <property name="use_stock">True</property>
-                                            <signal handler="on_setting_pref_remove_clicked" name="clicked"/>
+                                            <signal name="clicked" handler="on_setting_pref_remove_clicked"/>
                                           </object>
                                           <packing>
                                             <property name="position">1</property>
@@ -1012,12 +1020,13 @@
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="setting.pref.modify">
+                                            <property name="label" translatable="yes">Modify</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="can_default">True</property>
-                                            <property name="label" translatable="yes">Modify</property>
+                                            <property name="receives_default">False</property>
                                             <property name="use_underline">True</property>
-                                            <signal handler="on_setting_pref_modify_clicked" name="clicked"/>
+                                            <signal name="clicked" handler="on_setting_pref_modify_clicked"/>
                                           </object>
                                           <packing>
                                             <property name="position">2</property>
@@ -1042,6 +1051,9 @@
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="label12342">
@@ -1056,59 +1068,77 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkHButtonBox" id="hbuttonbox7">
                 <property name="visible">True</property>
                 <property name="border_width">3</property>
                 <property name="spacing">4</property>
-                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <property name="layout_style">end</property>
                 <child>
                   <object class="GtkButton" id="button.close">
+                    <property name="label">gtk-close</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-close</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal handler="on_search_button_close_clicked" name="clicked"/>
+                    <signal name="clicked" handler="on_search_button_close_clicked"/>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="button.stop">
+                    <property name="label">gtk-stop</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-stop</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal handler="on_search_button_stop_clicked" name="clicked"/>
+                    <signal name="clicked" handler="on_search_button_stop_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="button.next">
+                    <property name="label">gtk-find</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-find</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal handler="on_search_button_next_clicked" name="clicked"/>
+                    <signal name="clicked" handler="on_search_button_next_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="button.jump">
+                    <property name="label">gtk-find</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-find</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal handler="on_search_button_jump_clicked" name="clicked"/>
+                    <signal name="clicked" handler="on_search_button_jump_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
