diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index 68757a94cd..59aff8d638 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -3,9 +3,7 @@
   <object class="GtkGrid" id="grid">
     <child>
       <object class="GtkToolbar" id="toolbar">
-        <property name="orientation">horizontal</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
+        <property name="hexpand">1</property>
         <style>
           <class name="primary-toolbar"/>
         </style>
@@ -37,16 +35,14 @@
     </child>
     <child>
       <object class="GtkInfoBar" id="infobar">
-        <property name="no-show-all">True</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
+        <property name="no-show-all">1</property>
+        <property name="hexpand">1</property>
         <child internal-child="content_area">
           <object class="GtkBox" id="content_area">
             <child>
               <object class="GtkLabel" id="message">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
-                <property name="halign">fill</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
           </object>
@@ -55,10 +51,10 @@
           <object class="GtkBox" id="action_area">
             <child>
               <object class="GtkButton" id="button">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">_OK</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use_underline">1</property>
               </object>
             </child>
           </object>
@@ -74,10 +70,8 @@
         <property name="shadow-type">in</property>
         <child>
           <object class="GtkTextView" id="contents">
-            <property name="halign">fill</property>
-            <property name="valign">fill</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
           </object>
         </child>
       </object>
@@ -88,9 +82,8 @@
     </child>
     <child>
       <object class="GtkStatusbar" id="status">
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <property name="visible">True</property>
+        <property name="hexpand">1</property>
+        <property name="visible">1</property>
       </object>
       <packing>
         <property name="left-attach">0</property>
diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index 6a014ca52a..053350797f 100644
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -24,8 +24,8 @@
     </data>
   </object>
   <object class="GtkAboutDialog" id="aboutdialog1">
-    <property name="program-name" translatable="yes">Builder demo</property>
-    <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
+    <property name="program-name" translatable="1">Builder demo</property>
+    <property name="logo-icon-name" translatable="1">gtk3-demo</property>
     <accessibility>
       <relation target="window1" type="subwindow-of"/>
     </accessibility>
@@ -33,13 +33,13 @@
   <object class="GtkWindow" id="window1">
     <property name="default_height">250</property>
     <property name="default_width">440</property>
-    <property name="title" translatable="yes">Builder</property>
+    <property name="title" translatable="1">Builder</property>
     <child>
       <object class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-menubar">
                 <property name="AtkObject::accessible-name">The menubar</property>
@@ -47,49 +47,49 @@
             </child>
             <child>
               <object class="GtkMenuItem">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use-underline">True</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">_File</property>
+                <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="new_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_New</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_New</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="open_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Open</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Open</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="save_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Save</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Save</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="save_as_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Save _As</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">Save _As</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="quit_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Quit</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Quit</property>
+                        <property name="use-underline">1</property>
                         <property name="action-name">win.quit</property>
                       </object>
                     </child>
@@ -99,30 +99,30 @@
             </child>
             <child>
               <object class="GtkMenuItem">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use-underline">True</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">_Edit</property>
+                <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="copy_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Copy</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Copy</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="cut_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Cut</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Cut</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="paste_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Paste</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Paste</property>
+                        <property name="use-underline">1</property>
                       </object>
                     </child>
                   </object>
@@ -131,24 +131,24 @@
             </child>
             <child>
               <object class="GtkMenuItem">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use-underline">True</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <child>
                       <object class="GtkMenuItem" id="help_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Help</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_Help</property>
+                        <property name="use-underline">1</property>
                         <property name="action-name">win.help</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="about_item">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_About</property>
-                        <property name="use-underline">True</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">_About</property>
+                        <property name="use-underline">1</property>
                         <property name="action-name">win.about</property>
                       </object>
                     </child>
@@ -157,13 +157,10 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-toolbar">
                 <property name="AtkObject::accessible-name">The toolbar</property>
@@ -171,71 +168,70 @@
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">New</property>
-                <property name="tooltip-text" translatable="yes">Create a new file</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">New</property>
+                <property name="tooltip-text" translatable="1">Create a new file</property>
                 <property name="icon-name">document-new</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Open</property>
-                <property name="tooltip-text" translatable="yes">Open a file</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Open</property>
+                <property name="tooltip-text" translatable="1">Open a file</property>
                 <property name="icon-name">document-open</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Save</property>
-                <property name="tooltip-text" translatable="yes">Save a file</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Save</property>
+                <property name="tooltip-text" translatable="1">Save a file</property>
                 <property name="icon-name">document-save</property>
-                <property name="is-important">True</property>
+                <property name="is-important">1</property>
               </object>
             </child>
             <child>
               <object class="GtkSeparatorToolItem">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Copy</property>
-                <property name="tooltip-text" translatable="yes">Copy selected object into the clipboard</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Copy</property>
+                <property name="tooltip-text" translatable="1">Copy selected object into the clipboard</property>
                 <property name="icon-name">edit-copy</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Cut</property>
-                <property name="tooltip-text" translatable="yes">Cut selected object into the clipboard</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Cut</property>
+                <property name="tooltip-text" translatable="1">Cut selected object into the clipboard</property>
                 <property name="icon-name">edit-cut</property>
               </object>
             </child>
             <child>
               <object class="GtkToolButton">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Paste</property>
-                <property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Paste</property>
+                <property name="tooltip-text" translatable="1">Paste object from the clipboard</property>
                 <property name="icon-name">edit-paste</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="position">1</property>
-            <property name="expand">False</property>
           </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="shadow_type">in</property>
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="model">liststore1</property>
                 <property name="tooltip-column">3</property>
                 <child internal-child="accessible">
@@ -284,16 +280,15 @@
           </object>
           <packing>
             <property name="position">2</property>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkStatusbar" id="statusbar1">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
           </object>
           <packing>
             <property name="position">3</property>
-            <property name="expand">False</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index e55b555e54..086c453dbe 100644
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -25,24 +25,21 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Filter Model</property>
+    <property name="title" translatable="1">Filter Model</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
         <property name="margin_left">10</property>
         <property name="margin_right">10</property>
         <property name="margin_top">10</property>
         <property name="margin_bottom">10</property>
         <property name="row_spacing">10</property>
         <property name="column_spacing">10</property>
-        <property name="column_homogeneous">True</property>
+        <property name="column_homogeneous">1</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Original</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Original</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -55,16 +52,16 @@
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="model">liststore1</property>
-            <property name="headers_clickable">False</property>
+            <property name="headers_clickable">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection1"/>
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                <property name="title" translatable="yes">Width</property>
+                <property name="title" translatable="1">Width</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext1"/>
                 </child>
@@ -72,7 +69,7 @@
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                <property name="title" translatable="yes">Height</property>
+                <property name="title" translatable="1">Height</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
                 </child>
@@ -86,16 +83,16 @@
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="headers_clickable">False</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="headers_clickable">0</property>
             <property name="search_column">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection3"/>
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn3">
-                <property name="title" translatable="yes">Width</property>
+                <property name="title" translatable="1">Width</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext3"/>
                 </child>
@@ -103,7 +100,7 @@
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn4">
-                <property name="title" translatable="yes">Height</property>
+                <property name="title" translatable="1">Height</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext4"/>
                 </child>
@@ -111,7 +108,7 @@
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn5">
-                <property name="title" translatable="yes">Area</property>
+                <property name="title" translatable="1">Area</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext5"/>
                 </child>
@@ -119,7 +116,7 @@
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn6">
-                <property name="title" translatable="yes">Square</property>
+                <property name="title" translatable="1">Square</property>
                 <child>
                   <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1">
                     <property name="icon-name">object-select-symbolic</property>
@@ -135,9 +132,8 @@
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Computed Columns</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Computed Columns</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -150,9 +146,8 @@
         </child>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Filtered</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Filtered</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -165,16 +160,16 @@
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="headers_clickable">False</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="headers_clickable">0</property>
             <property name="search_column">0</property>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection5"/>
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn7">
-                <property name="title" translatable="yes">Width</property>
+                <property name="title" translatable="1">Width</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext6"/>
                 </child>
@@ -182,7 +177,7 @@
             </child>
             <child>
               <object class="GtkTreeViewColumn" id="treeviewcolumn8">
-                <property name="title" translatable="yes">Height</property>
+                <property name="title" translatable="1">Height</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext7"/>
                 </child>
@@ -194,12 +189,6 @@
             <property name="top_attach">3</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
   </object>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index a4e73d2afe..304b7d492e 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -3,311 +3,227 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <property name="default-width">600</property>
     <property name="default-height">500</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="show_close_button">True</property>
+        <property name="visible">1</property>
+        <property name="show_close_button">1</property>
         <property name="title">Font Features</property>
         <child>
           <object class="GtkButton" id="reset">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="tooltip-text">Reset</property>
             <signal name="clicked" handler="reset" swapped="no"/>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="icon_name">view-refresh-symbolic</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="hscrollbar_policy">never</property>
             <child>
               <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <child>
                   <object class="GtkBox" id="box2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="margin">10</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFontButton" id="font">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
+                        <property name="receives_default">1</property>
                         <property name="font">Sans 12</property>
                         <signal name="font-set" handler="update" swapped="no"/>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="box14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="kern_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="kern">
-                                    <property name="label" translatable="yes">Enabled</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Enabled</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="kern_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Kerning</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Kerning</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="box15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="liga_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="liga">
-                                    <property name="label" translatable="yes">Common</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Common</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="liga_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="dlig_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="dlig">
-                                    <property name="label" translatable="yes">Discretionary</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Discretionary</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="dlig_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="hlig_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="hlig">
-                                    <property name="label" translatable="yes">Historical</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Historical</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="hlig_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="clig_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="clig">
-                                    <property name="label" translatable="yes">Contextual</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Contextual</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="clig_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
@@ -315,109 +231,78 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Ligatures</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Ligatures</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="box19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="smcp_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="smcp">
-                                    <property name="label" translatable="yes">Small Caps</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Small Caps</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="smcp_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="c2sc_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="c2sc">
-                                    <property name="label" translatable="yes">Small Caps from Caps</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Small Caps from Caps</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="c2sc_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -425,77 +310,61 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Letter Case</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Letter Case</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkRadioButton" id="numcasedefault">
-                                <property name="label" translatable="yes">Default</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Default</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="lnum">
-                                <property name="label" translatable="yes">Lining</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Lining</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">numcasedefault</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="onum">
-                                <property name="label" translatable="yes">Old-Style</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Old-Style</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">numcasedefault</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -503,77 +372,61 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Number Case</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Number Case</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkRadioButton" id="numspacedefault">
-                                <property name="label" translatable="yes">Default</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Default</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="pnum">
-                                <property name="label" translatable="yes">Proportional</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Proportional</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">numspacedefault</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="tnum">
-                                <property name="label" translatable="yes">Tabular</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Tabular</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">numspacedefault</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -581,77 +434,61 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Number Spacing</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Number Spacing</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkRadioButton" id="fractiondefault">
-                                <property name="label" translatable="yes">Off</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Off</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="frac">
-                                <property name="label" translatable="yes">Normal</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Normal</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">fractiondefault</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="afrc">
-                                <property name="label" translatable="yes">Alternate</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1">Alternate</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">fractiondefault</property>
                                 <signal name="notify::active" handler="update" swapped="no"/>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -659,109 +496,78 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Fractions</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Fractions</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander10">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="box21">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="zero_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="zero">
-                                    <property name="label" translatable="yes">Slashed Zero</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Slashed Zero</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="zero_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box22">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="nalt_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="nalt">
-                                    <property name="label" translatable="yes">Alt. Annotation</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Alt. Annotation</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="nalt_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -769,191 +575,136 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label11">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Numeric Extras</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Numeric Extras</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander11">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="box28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="swsh_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="swsh">
-                                    <property name="label" translatable="yes">Swash</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Swash</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="swsh_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box29">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="calt_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="calt">
-                                    <property name="label" translatable="yes">Contextual</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Contextual</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="calt_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box30">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="hist_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="hist">
-                                    <property name="label" translatable="yes">Historical</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Historical</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="hist_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box31">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="salt_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="salt">
-                                    <property name="label" translatable="yes">Stylistic</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Stylistic</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="salt_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
@@ -961,232 +712,165 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Character Alternatives</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Character Alternatives</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkExpander" id="expander12">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <child>
                           <object class="GtkBox" id="box10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
                             <property name="margin_top">10</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="box23">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="ss01_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss01">
-                                    <property name="label" translatable="yes">Set 1</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Set 1</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="ss01_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="ss02_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss02">
-                                    <property name="label" translatable="yes">Set 2</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Set 2</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="ss02_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box25">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="ss03_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss03">
-                                    <property name="label" translatable="yes">Set 3</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Set 3</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="ss03_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box26">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="ss04_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss04">
-                                    <property name="label" translatable="yes">Set 4</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Set 4</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="ss04_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <child>
                                   <object class="GtkCheckButton" id="ss05_dflt">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ss05">
-                                    <property name="label" translatable="yes">Set 5</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Set 5</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="notify::active" handler="update" swapped="no"/>
                                     <property name="sensitive" bind-source="ss05_dflt" bind-property="active" bind-flags="sync-create|bidirectional"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">4</property>
                               </packing>
                             </child>
@@ -1194,15 +878,12 @@
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Alternative Stylistic Sets</property>
+                            <property name="visible">1</property>
+                            <property name="label" translatable="1">Alternative Stylistic Sets</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">9</property>
                       </packing>
                     </child>
@@ -1214,33 +895,26 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box12">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkStack" id="stack">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="margin_start">20</property>
                 <property name="margin_end">20</property>
                 <property name="margin_top">20</property>
                 <property name="margin_bottom">20</property>
                 <child>
                   <object class="GtkEventBox">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <signal name="button-press-event" handler="switch_to_entry"/>
                     <child>
                       <object class="GtkLabel" id="label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="wrap">True</property>
+                        <property name="visible">1</property>
+                        <property name="wrap">1</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="valign">start</property>
@@ -1253,8 +927,8 @@
                 </child>
                 <child>
                   <object class="GtkEntry" id="entry">
-                    <property name="visible">True</property>
-                    <property name="text">Lucky affluent actor asks to feast on giant 10.34" cheese-filled quiche in fjord.</property>
+                    <property name="visible">1</property>
+                    <property name="text">Lucky affluent actor asks to feast on giant 10.34&quot; cheese-filled quiche in fjord.</property>
                     <signal name="key-press-event" handler="entry_key_press"/>
                     <signal name="activate" handler="switch_to_label"/>
                     <property name="valign">start</property>
@@ -1265,30 +939,24 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="expand">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="settings">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="margin_start">20</property>
                 <property name="margin_end">20</property>
                 <property name="margin_bottom">20</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index b9423f2366..c6d9cf9acc 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -3,37 +3,32 @@
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkdemo 3.10 -->
   <object class="GtkMenu" id="menu1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="visible">1</property>
     <child>
       <object class="GtkMenuItem" id="menuitem1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Email message</property>
-        <property name="use_underline">True</property>
+        <property name="visible">1</property>
+        <property name="label" translatable="1">Email message</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menuitem2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Embed message</property>
-        <property name="use_underline">True</property>
+        <property name="visible">1</property>
+        <property name="label" translatable="1">Embed message</property>
+        <property name="use_underline">1</property>
       </object>
     </child>
   </object>
   <template class="GtkMessageRow" parent="GtkListBoxRow">
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
+        <property name="visible">1</property>
+        <property name="hexpand">1</property>
         <child>
           <object class="GtkImage" id="avatar_image">
             <property name="width_request">32</property>
             <property name="height_request">32</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin_top">8</property>
@@ -45,70 +40,57 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
             <property name="height">5</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
             <property name="baseline_position">top</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="valign">baseline</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkLabel" id="source_name">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="valign">baseline</property>
-                    <property name="label" translatable="no">Username</property>
+                    <property name="label" translatable="0">Username</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="source_nick">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="valign">baseline</property>
-                <property name="label" translatable="no">@nick</property>
+                <property name="label" translatable="0">@nick</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="short_time_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="valign">baseline</property>
-                <property name="label" translatable="yes">38m</property>
+                <property name="label" translatable="1">38m</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>
@@ -117,67 +99,50 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="content_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="no">Message</property>
-            <property name="wrap">True</property>
+            <property name="label" translatable="0">Message</property>
+            <property name="wrap">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="resent_box">
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="icon_name">media-playlist-repeat</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Resent by</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Resent by</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLinkButton" id="resent_by_button">
-                <property name="label" translatable="no">reshareer</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="label" translatable="0">reshareer</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="relief">none</property>
                 <property name="uri">http://www.gtk.org</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -185,103 +150,80 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="expand_button">
-                <property name="label" translatable="yes">Expand</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="label" translatable="1">Expand</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="relief">none</property>
                 <signal name="clicked" handler="expand_clicked" swapped="yes"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="extra_buttons_box">
-                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="reply-button">
-                    <property name="label" translatable="yes">Reply</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="label" translatable="1">Reply</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="reshare-button">
-                    <property name="label" translatable="yes">Reshare</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="label" translatable="1">Reshare</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="favorite-buttton">
-                    <property name="label" translatable="yes">Favorite</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="label" translatable="1">Favorite</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="more-button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <property name="popup">menu1</property>
                     <child>
                       <object class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">More...</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">More...</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -289,123 +231,90 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="details_revealer">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkBox" id="box5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="box7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="margin_top">2</property>
                     <property name="margin_bottom">2</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkFrame" id="frame1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
+                        <property name="visible">1</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_reshares_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="no">&lt;b&gt;2&lt;/b&gt;
+                            <property name="visible">1</property>
+                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 Reshares</property>
-                            <property name="use_markup">True</property>
+                            <property name="use_markup">1</property>
                           </object>
                         </child>
                         <child type="label_item">
-                          <placeholder/>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
+                        <property name="visible">1</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_favorites_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="no">&lt;b&gt;2&lt;/b&gt;
+                            <property name="visible">1</property>
+                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 FAVORITES</property>
-                            <property name="use_markup">True</property>
+                            <property name="use_markup">1</property>
                           </object>
                         </child>
                         <child type="label_item">
-                          <placeholder/>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="box6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkLabel" id="detailed_time_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="no">4:25 AM - 14 Jun 13 </property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="0">4:25 AM - 14 Jun 13 </property>
                         <style>
                           <class name="dim-label"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="button5">
-                        <property name="label" translatable="yes">Details</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="label" translatable="1">Details</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
+                        <property name="receives_default">1</property>
                         <property name="relief">none</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -415,8 +324,6 @@ FAVORITES</property>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index 5abb251b58..27979f392b 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -33,62 +33,54 @@
   <object class="GtkApplicationWindow" id="window">
     <property name="default-width">800</property>
     <property name="default-height">600</property>
-    <property name="can_focus">False</property>
     <property name="title">GTK+ Demo</property>
     <signal name="delete-event" handler="gtk_false" swapped="no"/>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show-close-button">True</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">1</property>
         <child>
           <object class="GtkButton" id="run_button">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="valign">center</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">1</property>
             <property name="action_name">win.run</property>
             <style>
               <class name="text-button"/>
             </style>
             <child>
               <object class="GtkLabel" id="run_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Run</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Run</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack_type">start</property>
-          </packing>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">0</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkFrame">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow">
                 <property name="width_request">120</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <property name="hscrollbar_policy">never</property>
-                <property name="shadow_type">none</property>
                 <property name="min_content_width">150</property>
                 <style>
                   <class name="sidebar"/>
                 </style>
                 <child>
                   <object class="GtkTreeView" id="treeview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="model">treestore</property>
-                    <property name="headers_visible">False</property>
+                    <property name="headers_visible">0</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="treeview-selection">
                         <property name="mode">browse</property>
@@ -96,7 +88,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                        <property name="title" translatable="yes">column</property>
+                        <property name="title" translatable="1">column</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext1"/>
                           <attributes>
@@ -111,94 +103,84 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="notebook">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="scrollable">True</property>
-            <property name="enable_popup">True</property>
-            <property name="show_border">False</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="scrollable">1</property>
+            <property name="enable_popup">1</property>
+            <property name="show_border">0</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">none</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <child>
                   <object class="GtkTextView" id="info-textview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="left-margin">20</property>
                     <property name="right-margin">20</property>
                     <property name="top-margin">20</property>
                     <property name="bottom-margin">20</property>
                     <property name="pixels_above_lines">2</property>
                     <property name="pixels_below_lines">2</property>
-                    <property name="editable">False</property>
+                    <property name="editable">0</property>
                     <property name="wrap_mode">word</property>
-                    <property name="cursor_visible">False</property>
+                    <property name="cursor_visible">0</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="tab_expand">True</property>
+                <property name="tab_expand">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Info</property>
-                <property name="use_underline">True</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">_Info</property>
+                <property name="use_underline">1</property>
               </object>
               <packing>
-                <property name="tab_expand">True</property>
-                <property name="tab_fill">False</property>
+                <property name="tab_expand">1</property>
+                <property name="tab_fill">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="source-scrolledwindow">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">none</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <child>
                   <object class="GtkTextView" id="source-textview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="left-margin">20</property>
                     <property name="right-margin">20</property>
                     <property name="top-margin">20</property>
                     <property name="bottom-margin">20</property>
-                    <property name="editable">False</property>
-                    <property name="cursor_visible">False</property>
+                    <property name="editable">0</property>
+                    <property name="cursor_visible">0</property>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">True</property>
+                <property name="tab_expand">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Source</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Source</property>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">False</property>
+                <property name="tab_fill">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui
index 39121a399a..eef2a35e4d 100644
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -4,51 +4,51 @@
   <object class="GtkWindow" id="window1">
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
-        <property name="title" translatable="yes">Model Button</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">1</property>
+        <property name="title" translatable="1">Model Button</property>
       </object>
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="margin">80</property>
         <child>
           <object class="GtkMenuButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="popover">thing_a</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="label">Color</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkMenuButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="popover">thing_b</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="label">Flavors</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkMenuButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="popover">thing_c</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="label">Tools</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
           </object>
@@ -59,37 +59,31 @@
   <object class="GtkPopover" id="thing_a">
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="halign">fill</property>
+            <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'red'</property>
             <property name="text">Red</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="halign">fill</property>
+            <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'green'</property>
             <property name="text">Green</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="halign">fill</property>
+            <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'blue'</property>
             <property name="text">Blue</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
           </object>
         </child>
       </object>
@@ -98,32 +92,32 @@
   <object class="GtkPopover" id="thing_b">
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="action-name">win.chocolate</property>
             <property name="text">Chocolate</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="action-name">win.vanilla</property>
             <property name="text">Vanilla</property>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="action-name">win.sprinkles</property>
             <property name="text">Add Sprinkles</property>
           </object>
@@ -134,13 +128,13 @@
   <object class="GtkPopover" id="thing_c">
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="text">Hammer</property>
             <property name="role">check</property>
             <signal name="clicked" handler="tool_clicked"/>
@@ -148,7 +142,7 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="text">Screwdriver</property>
             <property name="role">check</property>
             <signal name="clicked" handler="tool_clicked"/>
@@ -156,7 +150,7 @@
         </child>
         <child>
           <object class="GtkModelButton">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="text">Drill</property>
             <property name="role">check</property>
             <signal name="clicked" handler="tool_clicked"/>
diff --git a/demos/gtk-demo/popover.ui b/demos/gtk-demo/popover.ui
index 0a70b47d24..9042790e13 100644
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -41,39 +41,32 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkEntry" id="entry1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="primary_icon_name">edit-find</property>
             <property name="secondary_icon_name">edit-clear</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="vexpand">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="vexpand">1</property>
                 <property name="model">liststore1</property>
-                <property name="headers_visible">False</property>
-                <property name="enable_search">False</property>
+                <property name="headers_visible">0</property>
+                <property name="enable_search">0</property>
                 <property name="search_column">2</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
@@ -92,8 +85,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui
index 356b2606b0..0265ab355d 100644
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -8,17 +8,17 @@
     <property name="title">Revealer</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <child>
           <object class="GtkRevealer" id="revealer0">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -31,12 +31,12 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer1">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-up</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -49,12 +49,12 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer2">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-right</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -67,11 +67,11 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer3">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -84,12 +84,12 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer4">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-left</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -102,12 +102,12 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer5">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-up</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -120,12 +120,12 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer6">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-right</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -138,11 +138,11 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer7">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
@@ -155,12 +155,12 @@
         </child>
         <child>
           <object class="GtkRevealer" id="revealer8">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="transition-duration">2000</property>
             <property name="transition-type">slide-left</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">face-cool-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index b09ce43751..5587e4b60c 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -2,86 +2,69 @@
 <interface>
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">0</property>
     <property name="upper">4</property>
     <property name="value">2</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="lower">0</property>
     <property name="upper">4</property>
     <property name="value">2</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="lower">0</property>
     <property name="upper">4</property>
     <property name="value">2</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Scales</property>
-    <property name="border-width" translatable="yes">20</property>
+    <property name="title" translatable="1">Scales</property>
+    <property name="border-width" translatable="1">20</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">Plain</property>
             <property name="xalign">0</property>
-            <property name="halign">fill</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="width-request">200</property>
-            <property name="draw_value">False</property>
+            <property name="draw_value">0</property>
             <property name="adjustment">adjustment1</property>
-            <property name="hexpand">True</property>
-            <property name="halign">fill</property>
+            <property name="hexpand">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">Marks</property>
             <property name="xalign">0</property>
-            <property name="halign">fill</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="width-request">200</property>
-            <property name="draw_value">False</property>
+            <property name="draw_value">0</property>
             <property name="adjustment">adjustment2</property>
-            <property name="hexpand">True</property>
-            <property name="halign">fill</property>
+            <property name="hexpand">1</property>
             <marks>
               <mark value="0" position="bottom"></mark>
               <mark value="1" position="bottom"></mark>
@@ -93,35 +76,28 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">Discrete</property>
             <property name="xalign">0</property>
-            <property name="halign">fill</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="width-request">200</property>
             <property name="round-digits">0</property>
-            <property name="draw_value">False</property>
+            <property name="draw_value">0</property>
             <property name="adjustment">adjustment3</property>
-            <property name="hexpand">True</property>
-            <property name="halign">fill</property>
+            <property name="hexpand">1</property>
             <marks>
               <mark value="0" position="bottom"></mark>
               <mark value="1" position="bottom"></mark>
@@ -133,8 +109,6 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/spinbutton.ui b/demos/gtk-demo/spinbutton.ui
index bd1e08cce2..6a8be39eb4 100644
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -3,26 +3,18 @@
   <object class="GtkAdjustment" id="basic_adjustment">
     <property name="lower">-10000</property>
     <property name="upper">10000</property>
-    <property name="value">0</property>
     <property name="step_increment">0.5</property>
     <property name="page_increment">100</property>
-    <property name="page_size">0</property>
   </object>
   <object class="GtkAdjustment" id="hex_adjustment">
-    <property name="lower">0</property>
     <property name="upper">255</property>
-    <property name="value">0</property>
     <property name="step_increment">1</property>
     <property name="page_increment">16</property>
-    <property name="page_size">0</property>
   </object>
   <object class="GtkAdjustment" id="time_adjustment">
-    <property name="lower">0</property>
     <property name="upper">1410</property>
-    <property name="value">0</property>
     <property name="step_increment">30</property>
     <property name="page_increment">60</property>
-    <property name="page_size">0</property>
   </object>
   <object class="GtkAdjustment" id="month_adjustment">
     <property name="lower">1</property>
@@ -30,23 +22,20 @@
     <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">5</property>
-    <property name="page_size">0</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Spin Button</property>
+    <property name="title" translatable="1">Spin Button</property>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
         <property name="margin">20</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">_Numeric</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">basic_spin</property>
             <property name="xalign">1</property>
           </object>
@@ -57,13 +46,13 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="basic_spin">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="width_chars">5</property>
             <property name="adjustment">basic_adjustment</property>
             <property name="climb_rate">1</property>
             <property name="digits">2</property>
-            <property name="numeric">True</property>
+            <property name="numeric">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -72,7 +61,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="basic_label">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="width_chars">10</property>
             <property name="xalign">1</property>
           </object>
@@ -83,9 +72,9 @@
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">_Hexadecimal</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">hex_spin</property>
             <property name="xalign">1</property>
           </object>
@@ -96,13 +85,13 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="hex_spin">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="width_chars">4</property>
             <property name="adjustment">hex_adjustment</property>
             <signal name="input" handler="hex_spin_input"/>
             <signal name="output" handler="hex_spin_output"/>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -111,7 +100,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="hex_label">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="width_chars">10</property>
             <property name="xalign">1</property>
           </object>
@@ -122,9 +111,9 @@
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">_Time</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">time_spin</property>
             <property name="xalign">1</property>
           </object>
@@ -135,13 +124,13 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="time_spin">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="width_chars">5</property>
             <property name="adjustment">time_adjustment</property>
             <signal name="input" handler="time_spin_input"/>
             <signal name="output" handler="time_spin_output"/>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -150,7 +139,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="time_label">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="width_chars">10</property>
             <property name="xalign">1</property>
           </object>
@@ -161,9 +150,9 @@
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label">_Month</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <property name="mnemonic_widget">month_spin</property>
             <property name="xalign">1</property>
           </object>
@@ -174,13 +163,13 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="month_spin">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
             <property name="width_chars">9</property>
             <signal name="input" handler="month_spin_input"/>
             <signal name="output" handler="month_spin_output"/>
             <property name="adjustment">month_adjustment</property>
-            <property name="wrap">True</property>
+            <property name="wrap">1</property>
             <property name="update_policy">if-valid</property>
           </object>
           <packing>
@@ -190,7 +179,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="month_label">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="width_chars">10</property>
             <property name="xalign">1</property>
           </object>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index 3ba841d264..f70e7ce890 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -2,65 +2,58 @@
 <interface>
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Stack</property>
+    <property name="title" translatable="1">Stack</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkStackSwitcher" id="switcher">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="stack">stack</property>
             <property name="halign">center</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="transition-type">crossfade</property>
             <child>
               <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="margin-top">20</property>
                 <property name="margin-bottom">20</property>
                 <property name="icon-name">gtk3-demo</property>
               </object>
               <packing>
                 <property name="name">page1</property>
-                <property name="title" translatable="yes">Page 1</property>
+                <property name="title" translatable="1">Page 1</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="checkbutton1">
-                <property name="label" translatable="yes">Page 2</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="label" translatable="1">Page 2</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="draw_indicator">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
               </object>
               <packing>
                 <property name="name">page2</property>
-                <property name="title" translatable="yes">Page 2</property>
+                <property name="title" translatable="1">Page 2</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinner" id="spinner1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="active">True</property>
+                <property name="active">1</property>
               </object>
               <packing>
                 <property name="name">page3</property>
@@ -71,8 +64,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index 728b1d1cf1..5d353a5bcc 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -5,158 +5,135 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkToolbar" id="toolbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="show-arrow">False</property>
+        <property name="visible">1</property>
+        <property name="hexpand">1</property>
+        <property name="show-arrow">0</property>
         <style>
           <class name="primary-toolbar"/>
         </style>
         <child>
           <object class="GtkToggleToolButton" id="toolbutton1">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Normal</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
             <property name="icon_name">edit-find</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="toolbutton2">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Active</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
             <property name="icon_name">edit-find</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="toolbutton3">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="1">Insensitive</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
             <property name="icon_name">edit-find</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="toolbutton5">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Raised</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Raised</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
             <property name="icon_name">edit-find-symbolic</property>
             <style>
               <class name="raised"/>
             </style>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="toolbutton6">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Raised Active</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Raised Active</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
             <property name="icon_name">edit-find-symbolic</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
             <style>
               <class name="raised"/>
             </style>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="toolbutton4">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="1">Insensitive Active</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">edit-find</property>
-            <property name="is_important">True</property>
-            <property name="active">True</property>
+            <property name="is_important">1</property>
+            <property name="active">1</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolitementry">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkEntry" id="entry1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <property name="invisible_char">•</property>
-                <property name="placeholder-text" translatable="yes">Search...</property>
+                <property name="placeholder-text" translatable="1">Search...</property>
                 <property name="secondary-icon-name">edit-find-symbolic</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolitemswitch">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkSwitch" id="switch1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">horizontal</property>
+        <property name="visible">1</property>
         <property name="valign">center</property>
         <property name="halign">center</property>
         <style>
@@ -164,46 +141,37 @@
         </style>
         <child>
           <object class="GtkButton" id="button1">
-            <property name="label" translatable="yes">Hi, I am a button</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="1">Hi, I am a button</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="use_action_appearance">0</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button2">
-            <property name="label" translatable="yes">And I'm another button</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="1">And I&apos;m another button</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="use_action_appearance">0</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" id="button3">
-            <property name="label" translatable="yes">This is a button party!</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
+            <property name="label" translatable="1">This is a button party!</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="use_action_appearance">0</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -211,106 +179,93 @@
     </child>
     <child>
       <object class="GtkToolbar" id="itoolbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
+        <property name="visible">1</property>
+        <property name="hexpand">1</property>
         <property name="icon_size">1</property>
         <style>
           <class name="inline-toolbar"/>
         </style>
         <child>
           <object class="GtkToggleToolButton" id="itoolbutton1">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Normal</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">list-add-symbolic</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="itoolbutton2">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Normal</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">list-add-symbolic</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="itoolbutton3">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Active</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">list-remove-symbolic</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="itoolbutton4">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Active</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">list-remove-symbolic</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="itoolbutton5">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="sensitive">0</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Insensitive</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">edit-find-symbolic</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton" id="itoolbutton6">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use_underline">True</property>
+            <property name="use_action_appearance">0</property>
+            <property name="visible">1</property>
+            <property name="sensitive">0</property>
+            <property name="use_action_appearance">0</property>
+            <property name="label" translatable="1">Insensitive Active</property>
+            <property name="use_underline">1</property>
             <property name="icon_name">go-up-symbolic</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="homogeneous">1</property>
           </packing>
         </child>
       </object>