From 7be382111340d6240b45e95126c7844134272b41 Mon Sep 17 00:00:00 2001
From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Wed, 17 Nov 2010 14:54:52 +0000
Subject: [PATCH] 1) matita.glade ported from glade2 to glade3 2) added a
 workaround (using xmlling) to convert &#x....; chars generated    by glade3
 into unicode symbols to avoid a corresponding lexing bug in    lablgladecc2
 :-(

---
 matita/matita/Makefile     |   5 +-
 matita/matita/matita.glade | 773 +++++++++++++++++++------------------
 2 files changed, 397 insertions(+), 381 deletions(-)

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index b269bd04a..2f50ce4d5 100644
--- a/matita/matita/Makefile
+++ b/matita/matita/Makefile
@@ -141,9 +141,12 @@ matitaclean: matitac
 matitaclean.opt: matitac.opt
 	$(H)test -f $@ || ln -s $< $@
 
-matitaGeneratedGui.ml: matita.glade
+matitaGeneratedGui.ml: matita.glade.utf8
 	$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
 
+matita.glade.utf8: matita.glade
+	$(H)xmllint --encode UTF8 $< > $@
+
 .PHONY: clean
 clean:
 	$(H)rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o \
diff --git a/matita/matita/matita.glade b/matita/matita/matita.glade
index 3b87423d0..46023a02e 100644
--- a/matita/matita/matita.glade
+++ b/matita/matita/matita.glade
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="BrowserWin">
     <property name="width_request">500</property>
     <property name="height_request">480</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">Cic browser</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="default_width">500</property>
     <property name="default_height">480</property>
     <property name="destroy_with_parent">True</property>
@@ -17,6 +17,7 @@
         <child>
           <widget class="GtkVBox" id="BrowserVBox">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkMenuBar" id="menubar2">
                 <property name="visible">True</property>
@@ -29,8 +30,8 @@
                       <widget class="GtkMenu" id="BrowserFileMenu_menu">
                         <child>
                           <widget class="GtkImageMenuItem" id="BrowserNewMenuItem">
-                            <property name="visible">True</property>
                             <property name="label">gtk-new</property>
+                            <property name="visible">True</property>
                             <property name="use_underline">True</property>
                             <property name="use_stock">True</property>
                           </widget>
@@ -40,7 +41,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Open _Location ...</property>
                             <property name="use_underline">True</property>
-                            <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                            <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                           </widget>
                         </child>
                         <child>
@@ -50,8 +51,8 @@
                         </child>
                         <child>
                           <widget class="GtkImageMenuItem" id="BrowserCloseMenuItem">
-                            <property name="visible">True</property>
                             <property name="label">gtk-close</property>
+                            <property name="visible">True</property>
                             <property name="use_underline">True</property>
                             <property name="use_stock">True</property>
                           </widget>
@@ -69,8 +70,8 @@
                       <widget class="GtkMenu" id="BrowserEditMenu_menu">
                         <child>
                           <widget class="GtkImageMenuItem" id="BrowserCopyMenuItem">
-                            <property name="visible">True</property>
                             <property name="label">gtk-copy</property>
+                            <property name="visible">True</property>
                             <property name="use_underline">True</property>
                             <property name="use_stock">True</property>
                           </widget>
@@ -101,6 +102,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -108,7 +110,7 @@
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="label_yalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <widget class="GtkHBox" id="BrowserHBox">
                     <property name="visible">True</property>
@@ -116,8 +118,8 @@
                       <widget class="GtkButton" id="BrowserNewButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
+                        <property name="relief">none</property>
                         <child>
                           <widget class="GtkImage" id="image303">
                             <property name="visible">True</property>
@@ -128,14 +130,15 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkButton" id="BrowserBackButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
+                        <property name="relief">none</property>
                         <child>
                           <widget class="GtkImage" id="image304">
                             <property name="visible">True</property>
@@ -153,8 +156,8 @@
                       <widget class="GtkButton" id="BrowserForwardButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="receives_default">False</property>
+                        <property name="relief">none</property>
                         <child>
                           <widget class="GtkImage" id="image305">
                             <property name="visible">True</property>
@@ -173,9 +176,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="tooltip" translatable="yes">refresh</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="relief">none</property>
                         <child>
                           <widget class="GtkImage" id="image229">
                             <property name="visible">True</property>
@@ -194,9 +197,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="tooltip" translatable="yes">home</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="relief">none</property>
                         <child>
                           <widget class="GtkImage" id="image190">
                             <property name="visible">True</property>
@@ -214,7 +217,7 @@
                       <widget class="GtkImage" id="image301">
                         <property name="visible">True</property>
                         <property name="stock">gtk-jump-to</property>
-                        <property name="icon_size">2</property>
+                        <property name="icon-size">2</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -250,8 +253,8 @@
                   <widget class="GtkScrolledWindow" id="ScrolledBrowser">
                     <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="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -263,17 +266,17 @@
                     <property name="label" translatable="yes">MathView</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkScrolledWindow" id="scrolledwindow9">
                     <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>
                       <widget class="GtkTreeView" id="whelpResultTreeview">
                         <property name="visible">True</property>
@@ -292,21 +295,21 @@
                     <property name="label" translatable="yes">WhelpResults</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">1</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkScrolledWindow" id="scrolledwindow11">
                     <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="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <widget class="GtkViewport" id="viewport2">
                         <property name="visible">True</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <widget class="GtkImage" id="BrowserImage">
                             <property name="visible">True</property>
@@ -326,17 +329,17 @@
                     <property name="label" translatable="yes">WhelpEasterEgg</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">2</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkScrolledWindow" id="GraphScrolledWin">
                     <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="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <placeholder/>
                     </child>
@@ -351,14 +354,15 @@
                     <property name="label" translatable="yes">Graph</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">3</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkVBox" id="vbox16">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow13">
                         <property name="visible">True</property>
@@ -370,27 +374,29 @@
                           </widget>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkToolbar" id="toolbar3">
                         <property name="visible">True</property>
-                        <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+                        <property name="toolbar_style">both</property>
                         <child>
                           <widget class="GtkToolItem" id="toolitem47">
                             <property name="visible">True</property>
                             <child>
                               <widget class="GtkButton" id="HBugsRefreshButton">
+                                <property name="label">gtk-refresh</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label">gtk-refresh</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_stock">True</property>
-                                <property name="response_id">0</property>
                               </widget>
                             </child>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
                           </packing>
                         </child>
                         <child>
@@ -398,17 +404,16 @@
                             <property name="visible">True</property>
                             <child>
                               <widget class="GtkButton" id="HBugsUnsubscribeButton">
+                                <property name="label">gtk-remove</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label">gtk-remove</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_stock">True</property>
-                                <property name="response_id">0</property>
                               </widget>
                             </child>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
                           </packing>
                         </child>
                         <child>
@@ -416,17 +421,16 @@
                             <property name="visible">True</property>
                             <child>
                               <widget class="GtkButton" id="HBugsSubscribeButton">
+                                <property name="label">gtk-add</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label">gtk-add</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_stock">True</property>
-                                <property name="response_id">0</property>
                               </widget>
                             </child>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="homogeneous">False</property>
                           </packing>
                         </child>
                       </widget>
@@ -447,17 +451,17 @@
                     <property name="label" translatable="yes">HBugs</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">4</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkScrolledWindow" id="textScrolledWin">
                     <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="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <widget class="GtkTreeView" id="universesTreeview">
                         <property name="visible">True</property>
@@ -475,26 +479,30 @@
                     <property name="label" translatable="yes">Universes</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">5</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkVBox" id="vbox20">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwinContent">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="border_width">3</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>
                           <placeholder/>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkHBox" id="hbox35">
@@ -504,6 +512,7 @@
                         <child>
                           <widget class="GtkVBox" id="vbox22">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -511,6 +520,9 @@
                               <placeholder/>
                             </child>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkEntry" id="entrySearch">
@@ -526,7 +538,7 @@
                           <widget class="GtkButton" id="buttonSearch">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="response_id">0</property>
+                            <property name="receives_default">False</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment21">
                                 <property name="visible">True</property>
@@ -544,6 +556,7 @@
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -586,9 +599,9 @@
                     <property name="label" translatable="yes">SearchText</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">6</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
               </widget>
@@ -605,16 +618,17 @@
     <property name="title" translatable="yes">DUMMY</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkLabel" id="ConfirmationDialogLabel">
             <property name="visible">True</property>
             <property name="label" translatable="yes">DUMMY</property>
-            <property name="justify">GTK_JUSTIFY_CENTER</property>
+            <property name="justify">center</property>
           </widget>
           <packing>
             <property name="expand">False</property>
@@ -625,34 +639,44 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="ConfirmationDialogCancelButton">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ConfirmationDialogOkButton">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -661,10 +685,11 @@
   <widget class="GtkDialog" id="EmptyDialog">
     <property name="visible">True</property>
     <property name="title" translatable="yes">DUMMY</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="EmptyDialogVBox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkLabel" id="EmptyDialogLabel">
             <property name="visible">True</property>
@@ -682,34 +707,44 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="EmptyDialogCancelButton">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="EmptyDialogOkButton">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -719,15 +754,14 @@
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Select File</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="show_fileops">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="cancel_button">
       <widget class="GtkButton" id="fileSelCancelButton">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="can_default">True</property>
-        <property name="response_id">0</property>
+        <property name="receives_default">False</property>
       </widget>
     </child>
     <child internal-child="ok_button">
@@ -735,7 +769,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="can_default">True</property>
-        <property name="response_id">0</property>
+        <property name="receives_default">False</property>
       </widget>
     </child>
   </widget>
@@ -747,10 +781,10 @@
         <child>
           <widget class="GtkVBox" id="vbox8">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkHandleBox" id="menuBarHandleBox">
                 <property name="visible">True</property>
-                <property name="shadow_type">GTK_SHADOW_OUT</property>
                 <child>
                   <widget class="GtkMenuBar" id="menubar1">
                     <property name="visible">True</property>
@@ -763,62 +797,38 @@
                           <widget class="GtkMenu" id="fileMenu_menu">
                             <child>
                               <widget class="GtkImageMenuItem" id="newMenuItem">
+                                <property name="label">_New</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_New</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1047">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-new</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="openMenuItem">
+                                <property name="label">_Open...</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Open...</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1048">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="saveMenuItem">
+                                <property name="label">_Save</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Save</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1049">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-save</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="saveAsMenuItem">
+                                <property name="label">Save _as ...</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Save _as ...</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="s" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1050">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-save-as</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -828,17 +838,11 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="quitMenuItem">
+                                <property name="label">_Quit</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Quit</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1052">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-quit</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                           </widget>
@@ -854,34 +858,22 @@
                           <widget class="GtkMenu" id="editMenu_menu">
                             <child>
                               <widget class="GtkImageMenuItem" id="undoMenuItem">
+                                <property name="label">_Undo</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="label" translatable="yes">_Undo</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1053">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-undo</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="z" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="redoMenuItem">
+                                <property name="label">_Redo</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="label" translatable="yes">_Redo</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="z" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1054">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-redo</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="z" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -891,47 +883,29 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="cutMenuItem">
+                                <property name="label">Cu_t</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Cu_t</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="x" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1055">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-cut</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="copyMenuItem">
+                                <property name="label">_Copy</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Copy</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="c" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1056">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-copy</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="pasteMenuItem">
+                                <property name="label">_Paste</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Paste</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="v" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1057">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-paste</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -959,16 +933,10 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="deleteMenuItem">
+                                <property name="label">_Delete</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Delete</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1058">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-delete</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                             <child>
@@ -990,17 +958,11 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="findReplMenuItem">
+                                <property name="label">_Find &amp; replace ...</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Find &amp; replace ...</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1059">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-find-and-replace</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1013,7 +975,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Next ligature</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="l" modifiers="GDK_MOD1_MASK" signal="activate"/>
+                                <accelerator key="l" signal="activate" modifiers="GDK_MOD1_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1039,7 +1001,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Execute 1 phrase</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                                <accelerator key="Page_Down" signal="activate" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1047,7 +1009,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Retract 1 phrase</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                                <accelerator key="Page_Up" signal="activate" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1060,7 +1022,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Execute all</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="End" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                                <accelerator key="End" signal="activate" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1068,7 +1030,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Restart</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="Home" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                                <accelerator key="Home" signal="activate" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1081,7 +1043,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Execute until cursor</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="period" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                                <accelerator key="period" signal="activate" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
                               </widget>
                             </child>
                           </widget>
@@ -1100,7 +1062,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">New CIC _browser</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="F3" modifiers="" signal="activate"/>
+                                <accelerator key="F3" signal="activate"/>
                               </widget>
                             </child>
                             <child>
@@ -1113,7 +1075,7 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">_Fullscreen</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="F11" modifiers="" signal="activate"/>
+                                <accelerator key="F11" signal="activate"/>
                               </widget>
                             </child>
                             <child>
@@ -1122,7 +1084,7 @@
                                 <property name="tooltip" translatable="yes">Shows a palette with natural deduction rules</property>
                                 <property name="label" translatable="yes">Natural deduction palette</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="F2" modifiers="" signal="activate"/>
+                                <accelerator key="F2" signal="activate"/>
                               </widget>
                             </child>
                             <child>
@@ -1132,47 +1094,29 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="increaseFontSizeMenuItem">
+                                <property name="label">Zoom _in</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Zoom _in</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1060">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-zoom-in</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="decreaseFontSizeMenuItem">
+                                <property name="label">Zoom _out</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Zoom _out</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1061">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-zoom-out</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="normalFontSizeMenuItem">
+                                <property name="label">_Normal size</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Normal size</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="equal" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1062">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-zoom-100</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -1227,16 +1171,11 @@
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="showUnicodeTable">
+                                <property name="label">TeX/UTF-8 table</property>
                                 <property name="visible">True</property>
                                 <property name="tooltip" translatable="yes">Show the conversion table from TeX like sequences to UTF-8</property>
-                                <property name="label" translatable="yes">TeX/UTF-8 table</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image20">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-select-font</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                           </widget>
@@ -1268,31 +1207,19 @@
                           <widget class="GtkMenu" id="helpMenu_menu">
                             <child>
                               <widget class="GtkImageMenuItem" id="contentsMenuItem">
+                                <property name="label">_Contents</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Contents</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="F1" modifiers="" signal="activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1063">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-help</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
+                                <accelerator key="F1" signal="activate"/>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="aboutMenuItem">
+                                <property name="label">_About</property>
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">_About</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image1064">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-about</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                           </widget>
@@ -1305,6 +1232,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1321,11 +1249,11 @@
                         <child>
                           <widget class="GtkHandleBox" id="TacticsButtonsHandlebox">
                             <property name="visible">True</property>
-                            <property name="shadow_type">GTK_SHADOW_OUT</property>
-                            <property name="handle_position">GTK_POS_TOP</property>
+                            <property name="handle_position">top</property>
                             <child>
                               <widget class="GtkVBox" id="vboxTacticsPalette">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <widget class="GtkExpander" id="expander1">
                                     <property name="visible">True</property>
@@ -1333,31 +1261,33 @@
                                     <child>
                                       <widget class="GtkVBox" id="vbox1">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
                                           <widget class="GtkButton" id="butImpl_intro">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label8">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Implication (⇒&lt;sub&gt;i&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Implication (&#x21D2;&lt;sub&gt;i&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
                                           </widget>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <widget class="GtkButton" id="butAnd_intro">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label7">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Conjunction (∧&lt;sub&gt;i&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Conjunction (&#x2227;&lt;sub&gt;i&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1371,11 +1301,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label9">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Disjunction left (∨&lt;sub&gt;i-l&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Disjunction left (&#x2228;&lt;sub&gt;i-l&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1389,11 +1318,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label10">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Disjunction right (∨&lt;sub&gt;i-r&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Disjunction right (&#x2228;&lt;sub&gt;i-r&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1407,11 +1335,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label11">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Negation (¬&lt;sub&gt;i&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Negation (&#xAC;&lt;sub&gt;i&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1425,11 +1352,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label12">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Top (⊤&lt;sub&gt;i&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Top (&#x22A4;&lt;sub&gt;i&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1443,11 +1369,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label20">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Universal (∀&lt;sub&gt;i&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Universal (&#x2200;&lt;sub&gt;i&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1461,11 +1386,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label21">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Existential (∃&lt;sub&gt;i&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Existential (&#x2203;&lt;sub&gt;i&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1488,6 +1412,7 @@
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1497,31 +1422,33 @@
                                     <child>
                                       <widget class="GtkVBox" id="vbox3">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
                                           <widget class="GtkButton" id="butImpl_elim">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label22">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Implication (⇒&lt;sub&gt;e&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Implication (&#x21D2;&lt;sub&gt;e&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
                                           </widget>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <widget class="GtkButton" id="butAnd_elim_left">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label23">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Conjunction left (∧&lt;sub&gt;e-l&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Conjunction left (&#x2227;&lt;sub&gt;e-l&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1535,11 +1462,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label24">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Conjunction right (∧&lt;sub&gt;e-r&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Conjunction right (&#x2227;&lt;sub&gt;e-r&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1553,11 +1479,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label27">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Disjunction (∨&lt;sub&gt;e&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Disjunction (&#x2228;&lt;sub&gt;e&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1571,11 +1496,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label31">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Negation (¬&lt;sub&gt;e&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Negation (&#xAC;&lt;sub&gt;e&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1589,11 +1513,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label33">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Bottom (⊥&lt;sub&gt;e&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Bottom (&#x22A5;&lt;sub&gt;e&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1607,11 +1530,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label34">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Universal (∀&lt;sub&gt;e&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Universal (&#x2200;&lt;sub&gt;e&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1625,11 +1547,10 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="response_id">0</property>
                                             <child>
                                               <widget class="GtkLabel" id="label35">
                                                 <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Existential (∃&lt;sub&gt;e&lt;/sub&gt;)</property>
+                                                <property name="label" translatable="yes">Existential (&#x2203;&lt;sub&gt;e&lt;/sub&gt;)</property>
                                                 <property name="use_markup">True</property>
                                               </widget>
                                             </child>
@@ -1662,22 +1583,24 @@
                                     <child>
                                       <widget class="GtkVBox" id="vbox4">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
                                           <widget class="GtkButton" id="butRAA">
+                                            <property name="label" translatable="yes">Reduction to Absurdity (RAA)</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="label" translatable="yes">Reduction to Absurdity (RAA)</property>
-                                            <property name="response_id">0</property>
                                           </widget>
+                                          <packing>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <widget class="GtkButton" id="butUseLemma">
+                                            <property name="label" translatable="yes">Use lemma (lem)</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="label" translatable="yes">Use lemma (lem)</property>
-                                            <property name="response_id">0</property>
                                           </widget>
                                           <packing>
                                             <property name="position">1</property>
@@ -1685,11 +1608,10 @@
                                         </child>
                                         <child>
                                           <widget class="GtkButton" id="butDischarge">
+                                            <property name="label" translatable="yes">Discharge (discharge)</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="label" translatable="yes">Discharge (discharge)</property>
-                                            <property name="response_id">0</property>
                                           </widget>
                                           <packing>
                                             <property name="position">2</property>
@@ -1717,19 +1639,21 @@
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkVBox" id="vboxScript">
                             <property name="width_request">400</property>
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <widget class="GtkHBox" id="hbox28">
                                 <property name="visible">True</property>
                                 <child>
                                   <widget class="GtkToolbar" id="buttonsToolbar">
                                     <property name="visible">True</property>
-                                    <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+                                    <property name="toolbar_style">both</property>
                                     <child>
                                       <widget class="GtkToolItem" id="toolitem41">
                                         <property name="visible">True</property>
@@ -1737,9 +1661,9 @@
                                           <widget class="GtkButton" id="scriptTopButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
                                             <property name="tooltip" translatable="yes">Restart</property>
-                                            <property name="relief">GTK_RELIEF_NONE</property>
-                                            <property name="response_id">0</property>
+                                            <property name="relief">none</property>
                                             <child>
                                               <widget class="GtkImage" id="image920">
                                                 <property name="visible">True</property>
@@ -1751,7 +1675,6 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1761,9 +1684,9 @@
                                           <widget class="GtkButton" id="scriptRetractButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
                                             <property name="tooltip" translatable="yes">Retract 1 phrase</property>
-                                            <property name="relief">GTK_RELIEF_NONE</property>
-                                            <property name="response_id">0</property>
+                                            <property name="relief">none</property>
                                             <child>
                                               <widget class="GtkImage" id="image921">
                                                 <property name="visible">True</property>
@@ -1775,7 +1698,6 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1785,9 +1707,9 @@
                                           <widget class="GtkButton" id="scriptJumpButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
                                             <property name="tooltip" translatable="yes">Execute until point</property>
-                                            <property name="relief">GTK_RELIEF_NONE</property>
-                                            <property name="response_id">0</property>
+                                            <property name="relief">none</property>
                                             <child>
                                               <widget class="GtkImage" id="image922">
                                                 <property name="visible">True</property>
@@ -1799,7 +1721,6 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1809,9 +1730,9 @@
                                           <widget class="GtkButton" id="scriptAdvanceButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
                                             <property name="tooltip" translatable="yes">Execute 1 phrase</property>
-                                            <property name="relief">GTK_RELIEF_NONE</property>
-                                            <property name="response_id">0</property>
+                                            <property name="relief">none</property>
                                             <child>
                                               <widget class="GtkImage" id="image923">
                                                 <property name="visible">True</property>
@@ -1823,7 +1744,6 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1833,9 +1753,9 @@
                                           <widget class="GtkButton" id="scriptBottomButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
                                             <property name="tooltip" translatable="yes">Execute all</property>
-                                            <property name="relief">GTK_RELIEF_NONE</property>
-                                            <property name="response_id">0</property>
+                                            <property name="relief">none</property>
                                             <child>
                                               <widget class="GtkImage" id="image924">
                                                 <property name="visible">True</property>
@@ -1847,16 +1767,18 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
                                       </packing>
                                     </child>
                                   </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkToolbar" id="toolbar2">
                                     <property name="visible">True</property>
-                                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                                    <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="toolbar_style">both</property>
                                     <child>
                                       <widget class="GtkToolItem" id="toolitem46">
                                         <property name="visible">True</property>
@@ -1864,8 +1786,8 @@
                                           <widget class="GtkButton" id="scriptAbortButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="relief">GTK_RELIEF_NONE</property>
-                                            <property name="response_id">0</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="relief">none</property>
                                             <child>
                                               <widget class="GtkImage" id="image927">
                                                 <property name="visible">True</property>
@@ -1877,7 +1799,6 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
                                       </packing>
                                     </child>
                                   </widget>
@@ -1890,19 +1811,20 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkNotebook" id="scriptNotebook">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="tab_pos">GTK_POS_BOTTOM</property>
+                                <property name="tab_pos">bottom</property>
                                 <child>
                                   <widget class="GtkScrolledWindow" id="ScriptScrolledWin">
                                     <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="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <placeholder/>
                                     </child>
@@ -1914,16 +1836,16 @@
                                     <property name="label" translatable="yes">script</property>
                                   </widget>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="tab_fill">False</property>
+                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkScrolledWindow" id="scrolledwindow8">
                                     <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="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <widget class="GtkViewport" id="viewport1">
                                         <property name="visible">True</property>
@@ -1946,9 +1868,9 @@
                                     <property name="label" translatable="yes">outline</property>
                                   </widget>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="position">1</property>
                                     <property name="tab_fill">False</property>
+                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -1991,18 +1913,21 @@
                               <widget class="GtkScrolledWindow" id="logScrolledWin">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <property name="hscrollbar_policy">never</property>
+                                <property name="shadow_type">in</property>
                                 <child>
                                   <widget class="GtkTextView" id="logTextView">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="editable">False</property>
-                                    <property name="wrap_mode">GTK_WRAP_CHAR</property>
+                                    <property name="wrap_mode">char</property>
                                     <property name="cursor_visible">False</property>
                                   </widget>
                                 </child>
                               </widget>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
@@ -2017,6 +1942,9 @@
                       </packing>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
@@ -2031,6 +1959,9 @@
                     <property name="visible">True</property>
                     <property name="has_resize_grip">False</property>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkNotebook" id="HintNotebook">
@@ -2048,8 +1979,8 @@
                         <property name="label" translatable="yes">label14</property>
                       </widget>
                       <packing>
-                        <property name="type">tab</property>
                         <property name="tab_fill">False</property>
+                        <property name="type">tab</property>
                       </packing>
                     </child>
                     <child>
@@ -2067,9 +1998,9 @@
                         <property name="label" translatable="yes">label15</property>
                       </widget>
                       <packing>
-                        <property name="type">tab</property>
                         <property name="position">1</property>
                         <property name="tab_fill">False</property>
+                        <property name="type">tab</property>
                       </packing>
                     </child>
                     <child>
@@ -2087,9 +2018,9 @@
                         <property name="label" translatable="yes">label16</property>
                       </widget>
                       <packing>
-                        <property name="type">tab</property>
                         <property name="position">2</property>
                         <property name="tab_fill">False</property>
+                        <property name="type">tab</property>
                       </packing>
                     </child>
                   </widget>
@@ -2112,10 +2043,11 @@
   </widget>
   <widget class="GtkDialog" id="TextDialog">
     <property name="title" translatable="yes">DUMMY</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="vbox5">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkLabel" id="TextDialogLabel">
             <property name="visible">True</property>
@@ -2131,9 +2063,9 @@
           <widget class="GtkScrolledWindow" id="scrolledwindow2">
             <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>
               <widget class="GtkTextView" id="TextDialogTextView">
                 <property name="visible">True</property>
@@ -2148,34 +2080,44 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="TextDialogCancelButton">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="TextDialogOkButton">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -2185,15 +2127,17 @@
     <property name="height_request">280</property>
     <property name="title" translatable="yes">Uri choice</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">4</property>
         <child>
           <widget class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">3</property>
             <child>
               <widget class="GtkLabel" id="UriChoiceLabel">
@@ -2203,6 +2147,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -2210,8 +2155,8 @@
                 <property name="width_request">400</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="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
                 <child>
                   <widget class="GtkTreeView" id="UriChoiceTreeView">
                     <property name="visible">True</property>
@@ -2235,13 +2180,13 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkEntry" id="entry1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">*</property>
                   </widget>
                   <packing>
                     <property name="position">1</property>
@@ -2261,23 +2206,29 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="UriChoiceAbortButton">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="UriChoiceSelectedButton">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="response_id">0</property>
+                <property name="receives_default">False</property>
                 <child>
                   <widget class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
@@ -2295,6 +2246,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2315,32 +2267,38 @@
                 </child>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="UriChoiceConstantsButton">
+                <property name="label" translatable="yes">Try Constants</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label" translatable="yes">Try Constants</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="copyButton">
+                <property name="label">gtk-copy</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-copy</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -2349,7 +2307,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="response_id">0</property>
+                <property name="receives_default">False</property>
                 <child>
                   <widget class="GtkAlignment" id="alignment5">
                     <property name="visible">True</property>
@@ -2367,6 +2325,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2387,26 +2346,31 @@
                 </child>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">4</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="uriChoiceForwardButton">
+                <property name="label">gtk-go-forward</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-go-forward</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">5</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -2416,8 +2380,8 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Find &amp; Replace</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_MOUSE</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="window_position">mouse</property>
+    <property name="type_hint">dialog</property>
     <child>
       <widget class="GtkTable" id="table1">
         <property name="visible">True</property>
@@ -2455,7 +2419,6 @@
             <property name="has_focus">True</property>
             <property name="can_default">True</property>
             <property name="has_default">True</property>
-            <property name="invisible_char">*</property>
           </widget>
           <packing>
             <property name="left_attach">1</property>
@@ -2467,7 +2430,6 @@
           <widget class="GtkEntry" id="replaceEntry">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
           </widget>
           <packing>
             <property name="left_attach">1</property>
@@ -2484,6 +2446,7 @@
             <child>
               <widget class="GtkVBox" id="vbox9">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -2491,14 +2454,17 @@
                   <placeholder/>
                 </child>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="findButton">
+                <property name="label">gtk-find</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-find</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -2510,7 +2476,7 @@
               <widget class="GtkButton" id="findReplButton">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="response_id">0</property>
+                <property name="receives_default">False</property>
                 <child>
                   <widget class="GtkAlignment" id="alignment13">
                     <property name="visible">True</property>
@@ -2528,6 +2494,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2555,11 +2522,11 @@
             </child>
             <child>
               <widget class="GtkButton" id="cancelButton">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -2583,13 +2550,15 @@
     <property name="height_request">400</property>
     <property name="title" translatable="yes">title</property>
     <property name="modal">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="vbox14">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkVBox" id="vbox15">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkLabel" id="disambiguationErrorsLabel">
                 <property name="visible">True</property>
@@ -2598,15 +2567,16 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <widget class="GtkScrolledWindow" id="scrolledwindow12">
                 <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>
                   <widget class="GtkTreeView" id="treeview">
                     <property name="visible">True</property>
@@ -2627,23 +2597,30 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="button6">
+                <property name="label">gtk-help</property>
+                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-help</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="disambiguationErrorsMoreErrors">
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="response_id">-6</property>
+                <property name="receives_default">False</property>
                 <child>
                   <widget class="GtkAlignment" id="alignment18">
                     <property name="visible">True</property>
@@ -2661,6 +2638,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2681,40 +2659,49 @@
                 </child>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="disambiguationErrorsCancelButton">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="disambiguationErrorsOkButton">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -2725,11 +2712,12 @@
     <property name="height_request">400</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">Auto</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_SOUTH_EAST</property>
+    <property name="type_hint">dialog</property>
+    <property name="gravity">south-east</property>
     <child>
       <widget class="GtkVBox" id="vbox17">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <widget class="GtkHBox" id="hbox30">
             <property name="visible">True</property>
@@ -2738,8 +2726,8 @@
               <widget class="GtkScrolledWindow" id="scrolledwindowAREA">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <widget class="GtkViewport" id="viewportAREA">
                     <property name="visible">True</property>
@@ -2780,15 +2768,19 @@
                   </widget>
                 </child>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkVBox" id="vbox18">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <widget class="GtkButton" id="buttonUP">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <child>
                       <widget class="GtkAlignment" id="alignment19">
                         <property name="visible">True</property>
@@ -2806,6 +2798,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -2824,12 +2817,15 @@
                       </widget>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonDOWN">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+                    <property name="receives_default">False</property>
                     <child>
                       <widget class="GtkImage" id="image1065">
                         <property name="visible">True</property>
@@ -2849,6 +2845,9 @@
               </packing>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkHSeparator" id="hseparator3">
@@ -2869,59 +2868,73 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Last:</property>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkHButtonBox" id="hbuttonbox3">
                 <property name="visible">True</property>
                 <property name="border_width">4</property>
                 <property name="spacing">4</property>
-                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <property name="layout_style">end</property>
                 <child>
                   <widget class="GtkButton" id="buttonPAUSE">
+                    <property name="label">gtk-media-pause</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-media-pause</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonPLAY">
+                    <property name="label">gtk-media-play</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-media-play</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonNEXT">
+                    <property name="label">gtk-media-next</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-media-next</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonCLOSE">
+                    <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>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-- 
2.39.2