diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index 21bbc5c70c..02efcb42fb 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -23,58 +23,46 @@
             </child>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkLabel">
             <property name="label">fps</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkLabel">
             <property name="label" bind-source="bowl" bind-property="framerate"/>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkLabel">
             <property name="label">Icons, </property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkLabel">
             <property name="label" bind-source="bowl" bind-property="count"/>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkToggleButton" id="changes_allow">
             <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">1</property>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">0</property>
+            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean"/>
+            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean"/>
             <property name="icon-name">changes-prevent</property>
             <property name="relief">none</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
@@ -82,7 +70,7 @@
       <object class="GtkFishbowl" id="bowl">
         <property name="visible">True</property>
         <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">1</property>
+        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
       </object>
     </child>
   </object>
diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index 50b6efd1b3..1d4f7d3fcf 100644
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -35,7 +35,7 @@
             </child>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkToggleButton" id="search">
             <style>
               <class name="image-button"/>
@@ -46,9 +46,7 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 1662b9fc36..54384ef057 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -411,15 +411,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
             <property name="stack">toplevel_stack</property>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkMenuButton" id="gear_menu_button">
             <property name="valign">center</property>
             <property name="menu-model">gear_menu</property>
             <property name="icon-name">open-menu-symbolic</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
@@ -1588,16 +1586,14 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">center</property>
                                           </object>
                                         </child>
-                                        <child>
+                                        <child type="end">
                                           <object class="GtkMenuButton">
                                             <property name="menu-model">dinner_menu</property>
                                             <property name="halign">center</property>
                                             <property name="valign">center</property>
                                             <property name="icon-name">emblem-system-symbolic</property>
                                           </object>
-                                          <packing>
-                                            <property name="pack-type">end</property>
-                                          </packing>
+                                          <packing/>
                                         </child>
                                       </object>
                                     </child>
diff --git a/examples/application10/window.ui b/examples/application10/window.ui
index 68ae81c904..0051fc9391 100644
--- a/examples/application10/window.ui
+++ b/examples/application10/window.ui
@@ -22,25 +22,21 @@
             <property name="stack">stack</property>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkToggleButton" id="search">
             <property name="sensitive">0</property>
             <property name="icon-name">edit-find-symbolic</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkMenuButton" id="gears">
             <property name="direction">none</property>
             <style>
               <class name="image-button"/>
             </style>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
diff --git a/examples/application7/window.ui b/examples/application7/window.ui
index b748369f6a..59ce85aa9f 100644
--- a/examples/application7/window.ui
+++ b/examples/application7/window.ui
@@ -13,14 +13,12 @@
                 <property name="stack">stack</property>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkToggleButton" id="search">
                 <property name="sensitive">0</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
           </object>
         </child>
diff --git a/examples/application8/window.ui b/examples/application8/window.ui
index 278eafa8f5..3681e1787e 100644
--- a/examples/application8/window.ui
+++ b/examples/application8/window.ui
@@ -13,25 +13,21 @@
                 <property name="stack">stack</property>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkToggleButton" id="search">
                 <property name="sensitive">0</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkMenuButton" id="gears">
                 <property name="direction">none</property>
                 <style>
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
           </object>
         </child>
diff --git a/examples/application9/window.ui b/examples/application9/window.ui
index 2a173ea2ae..6cb5ad24a9 100644
--- a/examples/application9/window.ui
+++ b/examples/application9/window.ui
@@ -24,25 +24,21 @@
                 <property name="stack">stack</property>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkToggleButton" id="search">
                 <property name="sensitive">0</property>
                 <property name="icon-name">edit-find-symbolic</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkMenuButton" id="gears">
                 <property name="direction">none</property>
                 <style>
                   <class name="image-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 726c32ee78..be94879214 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -144,7 +144,7 @@
                                             </child>
                                             <child>
                                               <object class="GtkGestureLongPress">
-                                                <property name="touch-only">True</property>
+                                                <property name="touch-only">1</property>
                                                 <signal name="pressed" handler="long_press_cb" swapped="no"/>
                                               </object>
                                             </child>
@@ -258,7 +258,7 @@
                                 <property name="name">other_locations</property>
                                 <property name="child">
                                   <object class="GtkPlacesView" id="places_view">
-                                    <property name="local-only" bind-source="GtkFileChooserWidget" bind-property="local-only" bind-flags="default|sync-create"></property>
+                                    <property name="local-only" bind-source="GtkFileChooserWidget" bind-property="local-only" bind-flags="default|sync-create"/>
                                     <signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/>
                                     <signal name="show-error-message" handler="places_sidebar_show_error_message_cb" swapped="no"/>
                                   </object>
@@ -348,7 +348,7 @@
                 <property name="spacing">12</property>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkBox" id="filter_combo_hbox">
                 <child>
                   <object class="GtkComboBoxText" id="filter_combo">
@@ -361,9 +361,7 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index b621e08fb2..8d2bba6001 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -261,7 +261,7 @@
             </attributes>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="connect_button">
             <property name="label" translatable="yes">Con_nect</property>
             <property name="use-underline">1</property>
@@ -271,11 +271,9 @@
             <property name="valign">center</property>
             <signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkBox">
             <property name="hexpand">1</property>
             <child>
@@ -311,9 +309,7 @@
               <class name="linked"/>
             </style>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
diff --git a/tests/dialog.ui b/tests/dialog.ui
index baa032ec48..276c4271c7 100644
--- a/tests/dialog.ui
+++ b/tests/dialog.ui
@@ -1,235 +1,190 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name name -->
       <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkEntryCompletion" id="name_completion">
     <property name="model">liststore1</property>
     <property name="text_column">0</property>
-    <property name="inline_completion">True</property>
+    <property name="inline_completion">1</property>
   </object>
   <object class="GtkDialog" id="dialog">
-    <property name="can_focus">False</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
+    <property name="modal">1</property>
+    <property name="destroy_with_parent">1</property>
     <property name="type_hint">dialog</property>
     <property name="default_width">500</property>
     <property name="use_header_bar">1</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="titlebar">
-        <property name="visible">True</property>
         <property name="title" translatable="yes">Join Chat Room</property>
         <child>
           <object class="GtkButton" id="back_button">
-            <property name="visible">False</property>
-            <property name="can_focus">True</property>
+            <property name="visible">0</property>
+            <property name="can_focus">1</property>
             <property name="valign">center</property>
             <style>
               <class name="image-button"/>
             </style>
             <child>
-              <object class="GtkImage" id="back_icon">
-                <property name="visible">True</property>
-              </object>
+              <object class="GtkImage" id="back_icon"/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkButton" id="cancel_button">
             <property name="label" translatable="yes">_Cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <property name="use_underline">1</property>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="confirm_button">
             <property name="label" translatable="yes">_Join</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="can_default">True</property>
-            <property name="has_default">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
+            <property name="can_focus">1</property>
+            <property name="can_default">1</property>
+            <property name="has_default">1</property>
+            <property name="receives_default">1</property>
+            <property name="use_underline">1</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
             <property name="transition_type">slide-left-right</property>
             <child>
-              <object class="GtkGrid" id="grid1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_left">24</property>
-                <property name="margin_right">24</property>
-                <property name="margin_top">24</property>
-                <property name="margin_bottom">24</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="margin">
-                    <property name="visible">True</property>
-                    <property name="width_request">24</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="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="visibility">False</property>
-                    <property name="activates_default">True</property>
-                    <property name="placeholder_text" translatable="yes">optional</property>
-                    <property name="input_purpose">password</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="name_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
+              <object class="GtkStackPage">
+                <property name="name">main</property>
+                <property name="position">0</property>
+                <property name="child">
+                  <object class="GtkGrid" id="grid1">
+                    <property name="margin_left">24</property>
+                    <property name="margin_right">24</property>
                     <property name="margin_top">24</property>
-                    <property name="activates_default">True</property>
-                    <property name="completion">name_completion</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">2</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="add_connection_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="margin_bottom">24</property>
+                    <property name="row_spacing">12</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkBox" id="box1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
+                      <object class="GtkLabel" id="margin">
+                        <property name="width_request">24</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="password_entry">
+                        <property name="can_focus">1</property>
+                        <property name="hexpand">1</property>
+                        <property name="visibility">0</property>
+                        <property name="activates_default">1</property>
+                        <property name="placeholder_text" translatable="yes">optional</property>
+                        <property name="input_purpose">password</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="name_entry">
+                        <property name="can_focus">1</property>
+                        <property name="hexpand">1</property>
+                        <property name="margin_top">24</property>
+                        <property name="activates_default">1</property>
+                        <property name="completion">name_completion</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="add_connection_button">
+                        <property name="can_focus">1</property>
+                        <property name="receives_default">1</property>
                         <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">list-add-symbolic</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Add Connection</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">add_connection_button</property>
+                          <object class="GtkBox" id="box1">
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkImage" id="image1">
+                                <property name="icon_name">list-add-symbolic</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label1">
+                                <property name="label" translatable="yes">_Add Connection</property>
+                                <property name="use_underline">1</property>
+                                <property name="mnemonic_widget">add_connection_button</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="connection_combo">
+                        <property name="hexpand">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="connection_label">
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">C_onnection</property>
+                        <property name="use_underline">1</property>
+                        <property name="mnemonic_widget">connection_combo</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="name_label">
+                        <property name="halign">end</property>
+                        <property name="margin_top">24</property>
+                        <property name="label" translatable="yes">Room _Name</property>
+                        <property name="use_underline">1</property>
+                        <property name="mnemonic_widget">name_entry</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="password_label">
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">_Password</property>
+                        <property name="use_underline">1</property>
+                        <property name="mnemonic_widget">password_entry</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">3</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="connection_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="connection_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="label" translatable="yes">C_onnection</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">connection_combo</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" id="name_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">24</property>
-                    <property name="label" translatable="yes">Room _Name</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">name_entry</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="GtkLabel" id="password_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Password</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <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>
+                </property>
               </object>
-              <packing>
-                <property name="name">main</property>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/tests/selectionmode.ui b/tests/selectionmode.ui
index 7e6c5931f7..e9b40674ec 100644
--- a/tests/selectionmode.ui
+++ b/tests/selectionmode.ui
@@ -16,105 +16,87 @@
     <property name="default-height">480</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="visible">True</property>
-        <child>
+        <child type="start">
           <object class="GtkButton" id="headerbutton">
-            <property name="visible">True</property>
             <style>
               <class name="image-button"/>
             </style>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
                 <property name="icon-name">emblem-system-symbolic</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          <packing/>
         </child>
         <child type="title">
           <object class="GtkStack" id="titlestack">
-            <property name="visible">True</property>
             <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="label">Docker Docker Docker</property>
-                <property name="ellipsize">end</property>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">title</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkLabel">
+                    <property name="label">Docker Docker Docker</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkMenuButton">
-                <property name="visible">True</property>
-                <property name="menu-model">selectionmenu</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">4</property>
+              <object class="GtkStackPage">
+                <property name="name">selection</property>
+                <property name="child">
+                  <object class="GtkMenuButton">
+                    <property name="menu-model">selectionmenu</property>
                     <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="label">Click on items to select them</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon-name">pan-down-symbolic</property>
+                      <object class="GtkBox">
+                        <property name="spacing">4</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label">Click on items to select them</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="icon-name">pan-down-symbolic</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">selection</property>
-              </packing>
             </child>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="select-button">
-            <property name="visible">True</property>
             <style>
               <class name="image-button"/>
             </style>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
                 <property name="icon-name">object-select-symbolic</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="cancel-button">
             <property name="visible">0</property>
             <property name="label">Cancel</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkScrolledWindow">
-        <property name="visible">True</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
         <child>
           <object class="GtkListBox" id="list">
-            <property name="visible">True</property>
             <property name="selection-mode">none</property>
-            <property name="activate-on-single-click">True</property>
           </object>
         </child>
       </object>
diff --git a/tests/testsplitheaders.ui b/tests/testsplitheaders.ui
index 66bfe4e6dd..569c497d08 100644
--- a/tests/testsplitheaders.ui
+++ b/tests/testsplitheaders.ui
@@ -5,57 +5,43 @@
     <property name="icon-name">preferences-desktop-font</property>
     <child type="titlebar">
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkHeaderBar" id="sidebar-header">
-            <property name="visible">True</property>
-            <child>
+            <child type="end">
               <object class="GtkCheckButton">
-                <property name="visible">True</property>
                 <property name="valign">center</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
+              <packing/>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkSeparator">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
           </object>
         </child>
         <child>
           <object class="GtkHeaderBar" id="main-header">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <child>
+            <property name="hexpand">1</property>
+            <child type="start">
               <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="orientation">horizontal</property>
                 <style>
                   <class name="linked"/>
                 </style>
                 <child>
                   <object class="GtkButton">
-                    <property name="visible">True</property>
                     <property name="label">&lt;</property>
                     <property name="valign">center</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkButton">
-                    <property name="visible">True</property>
                     <property name="label">&gt;</property>
                     <property name="valign">center</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">start</property>
-              </packing>
+              <packing/>
             </child>
           </object>
         </child>
@@ -63,36 +49,29 @@
     </child>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkListBox" id="sidebar-content">
-            <property name="visible">True</property>
             <property name="selection-mode">none</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">Bla</property>
                 <property name="xalign">0</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">Bla bla</property>
                 <property name="xalign">0</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">Bla bla bla</property>
                 <property name="xalign">0</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">Bla bla bla bla</property>
                 <property name="xalign">0</property>
               </object>
@@ -101,20 +80,17 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="main-content">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <property name="hscrollbar-policy">always</property>
             <property name="vscrollbar-policy">always</property>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</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="label">Layout</property>
                   </object>
                   <packing>
@@ -124,7 +100,6 @@
                 </child>
                 <child>
                   <object class="GtkEntry" id="layout-entry">
-                    <property name="visible">True</property>
                     <property name="width-chars">25</property>
                   </object>
                   <packing>
@@ -134,7 +109,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
                     <property name="label">Decorations</property>
                   </object>
                   <packing>
@@ -143,9 +117,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="decorations">
-                    <property name="visible">True</property>
-                  </object>
+                  <object class="GtkCheckButton" id="decorations"/>
                   <packing>
                     <property name="left-attach">1</property>
                     <property name="top-attach">1</property>
@@ -159,14 +131,12 @@
     </child>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="sidebar-header"/>
       <widget name="sidebar-content"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="main-header"/>
       <widget name="main-content"/>
diff --git a/tests/teststackedheaders.ui b/tests/teststackedheaders.ui
index 4168be3357..932150ece4 100644
--- a/tests/teststackedheaders.ui
+++ b/tests/teststackedheaders.ui
@@ -5,117 +5,110 @@
     <property name="icon-name">preferences-desktop-font</property>
     <child type="titlebar">
       <object class="GtkStack" id="header_stack">
-        <property name="visible">True</property>
         <child>
-          <object class="GtkHeaderBar">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <property name="label">New</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="go_to_secondary"/>
-              </object>
-              <packing>
-                <property name="pack-type">start</property>
-              </packing>
-            </child>
-            <child type="title">
-              <object class="GtkStackSwitcher">
-                <property name="visible">True</property>
-                <property name="stack">page_stack</property>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">main</property>
-          </packing>
+            <property name="child">
+              <object class="GtkHeaderBar">
+                <child type="start">
+                  <object class="GtkButton">
+                    <property name="label">New</property>
+                    <property name="valign">center</property>
+                    <signal name="clicked" handler="go_to_secondary"/>
+                  </object>
+                  <packing/>
+                </child>
+                <child type="title">
+                  <object class="GtkStackSwitcher">
+                    <property name="stack">page_stack</property>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkHeaderBar">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <property name="label">&lt;</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="back_to_main"/>
-              </object>
-              <packing>
-                <property name="pack-type">start</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">secondary</property>
-          </packing>
+            <property name="child">
+              <object class="GtkHeaderBar">
+                <child type="start">
+                  <object class="GtkButton">
+                    <property name="label">&lt;</property>
+                    <property name="valign">center</property>
+                    <signal name="clicked" handler="back_to_main"/>
+                  </object>
+                  <packing/>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkStack" id="page_stack">
-        <property name="visible">True</property>
         <child>
-          <object class="GtkScrolledWindow">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hscrollbar-policy">always</property>
-            <property name="vscrollbar-policy">always</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">Page 1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">page1</property>
             <property name="title">Page 1</property>
-          </packing>
+            <property name="child">
+              <object class="GtkScrolledWindow">
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="hscrollbar-policy">always</property>
+                <property name="vscrollbar-policy">always</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="label">Page 1</property>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkScrolledWindow">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hscrollbar-policy">always</property>
-            <property name="vscrollbar-policy">always</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">Page 2</property>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">page2</property>
             <property name="title">Page 2</property>
-          </packing>
+            <property name="child">
+              <object class="GtkScrolledWindow">
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="hscrollbar-policy">always</property>
+                <property name="vscrollbar-policy">always</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="label">Page 2</property>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkScrolledWindow">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hscrollbar-policy">always</property>
-            <property name="vscrollbar-policy">always</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">Secondary</property>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">secondary</property>
-          </packing>
+            <property name="child">
+              <object class="GtkScrolledWindow">
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="hscrollbar-policy">always</property>
+                <property name="vscrollbar-policy">always</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="label">Secondary</property>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
       </object>
     </child>
diff --git a/testsuite/a11y/actionbar.ui b/testsuite/a11y/actionbar.ui
index b51c6975e3..dff152e4b0 100644
--- a/testsuite/a11y/actionbar.ui
+++ b/testsuite/a11y/actionbar.ui
@@ -1,51 +1,34 @@
-
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkActionBar" id="actionbar">
-        <property name="visible">True</property>
-        <child>
+        <child type="start">
           <object class="GtkButton" id="button1">
-            <property name="visible">True</property>
             <property name="label">Start 1</property>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="start">
           <object class="GtkButton" id="button2">
-            <property name="visible">True</property>
             <property name="label">Start 2</property>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="button3">
-            <property name="visible">True</property>
             <property name="label">End 1</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="button4">
-            <property name="visible">True</property>
             <property name="label">End 2</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
         <child type="center">
           <object class="GtkButton" id="button5">
-            <property name="visible">True</property>
             <property name="label">Center</property>
           </object>
         </child>
diff --git a/testsuite/a11y/headerbar.ui b/testsuite/a11y/headerbar.ui
index 01216abd83..6f5cc630bc 100644
--- a/testsuite/a11y/headerbar.ui
+++ b/testsuite/a11y/headerbar.ui
@@ -1,31 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkHeaderBar" id="headerbar1">
-        <property name="visible">True</property>
         <property name="title">Title</property>
         <property name="subtitle">Subtitle</property>
-        <child>
+        <child type="start">
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="page2">
             <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          <packing/>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/actionbar.ref.ui b/testsuite/reftests/actionbar.ref.ui
index 1cca9fe25d..6be3d79b30 100644
--- a/testsuite/reftests/actionbar.ref.ui
+++ b/testsuite/reftests/actionbar.ref.ui
@@ -1,55 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">1</property>
-          </object>         
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">2</property>
-          </object>         
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">Center</property>
-          </object>         
+          </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">1</property>
-          </object>         
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">2</property>
-          </object>         
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          </object>
         </child>
       </object>
     </child>
diff --git a/testsuite/reftests/actionbar.ui b/testsuite/reftests/actionbar.ui
index fd38632b2c..2071b50020 100644
--- a/testsuite/reftests/actionbar.ui
+++ b/testsuite/reftests/actionbar.ui
@@ -1,54 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkActionBar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
+        <child type="start">
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">1</property>
-          </object>         
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          </object>
+          <packing/>
         </child>
-        <child>
+        <child type="start">
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">2</property>
-          </object>         
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
+          </object>
+          <packing/>
         </child>
         <child type="center">
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">Center</property>
-          </object>         
+          </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">1</property>
-          </object>         
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          </object>
+          <packing/>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="label">2</property>
-          </object>         
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+          </object>
+          <packing/>
         </child>
       </object>
     </child>