diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index c08388187f..f4e82dbacd 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <interface>
   <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Application Class</property>
@@ -25,8 +24,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem">
-              </object>
+              <object class="GtkSeparatorToolItem"/>
             </child>
             <child>
               <object class="GtkToolButton">
diff --git a/demos/gtk-demo/appmenu.ui b/demos/gtk-demo/appmenu.ui
index d52693bac7..2d2997277d 100644
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index 168b4b22b6..b735e7394f 100644
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="window">
@@ -54,269 +53,275 @@
             <property name="vhomogeneous">0</property>
             <property name="transition-type">crossfade</property>
             <child>
-              <object class="GtkGrid">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Duck</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Background</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="duck"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="gradient"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend0"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">page0</property>
                 <property name="title" translatable="yes">Ducky</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkGrid">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="vexpand">1</property>
+                    <property name="row-spacing">12</property>
+                    <property name="column-spacing">12</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Duck</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Background</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="duck"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="gradient"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">
+Blended picture</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="halign">center</property>
+                        <style>
+                          <class name="blend0"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkGrid">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Red</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Blue</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="red"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="blue"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend1"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">page1</property>
                 <property name="title" translatable="yes">Blends</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkGrid">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="vexpand">1</property>
+                    <property name="row-spacing">12</property>
+                    <property name="column-spacing">12</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Red</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Blue</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="red"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="blue"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">
+Blended picture</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="halign">center</property>
+                        <style>
+                          <class name="blend1"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkGrid">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="cyan"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="magenta"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <style>
-                      <class name="yellow"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend2"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Cyan</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Magenta</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Yellow</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Blended picture</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">page2</property>
                 <property name="title" translatable="yes">CMYK</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkGrid">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">12</property>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="cyan"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="magenta"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <style>
+                          <class name="yellow"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="halign">center</property>
+                        <style>
+                          <class name="blend2"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Cyan</property>
+                        <property name="xalign">0</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Magenta</property>
+                        <property name="xalign">0</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Yellow</property>
+                        <property name="xalign">0</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Blended picture</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"></attribute>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
           </object>
           <packing>
@@ -326,7 +331,6 @@ Blended picture</property>
         </child>
       </object>
     </child>
-    <child type="titlebar">
-    </child>
+    <child type="titlebar"/>
   </object>
 </interface>
diff --git a/demos/gtk-demo/cursors.ui b/demos/gtk-demo/cursors.ui
index 8077c4c4c3..6394f7e582 100644
--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.94 -->
   <object class="GdkCursor" id="default_cursor">
     <property name="name">default</property>
   </object>
diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index 28c826d3a2..7ee0fa245d 100644
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,5 +1,3 @@
-<?xml version="1.0" standalone="no"?>
-<!--*- mode: xml -*-->
 <interface>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -76,8 +74,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem">
-                      </object>
+                      <object class="GtkSeparatorMenuItem"/>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="quit_item">
@@ -174,8 +171,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem">
-              </object>
+              <object class="GtkSeparatorToolItem"/>
             </child>
             <child>
               <object class="GtkToolButton">
@@ -254,8 +250,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar1">
-          </object>
+          <object class="GtkStatusbar" id="statusbar1"/>
         </child>
       </object>
     </child>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 585ad696cc..73cfdeeb13 100644
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name width -->
       <column type="gint"/>
-      <!-- column-name height -->
       <column type="gint"/>
     </columns>
     <data>
@@ -43,7 +39,7 @@
             <property name="label" translatable="yes">Original</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
             <accessibility>
               <relation type="label-for" target="treeview1"/>
@@ -149,7 +145,7 @@
             <property name="label" translatable="yes">Computed Columns</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
             <accessibility>
               <relation type="label-for" target="treeview2"/>
@@ -165,7 +161,7 @@
             <property name="label" translatable="yes">Filtered</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
             <accessibility>
               <relation type="label-for" target="treeview3"/>
diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index 973d9745ae..689217d18a 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window">
     <property name="title" translatable="yes">Fishbowl</property>
     <child type="titlebar">
@@ -69,8 +67,8 @@
         </child>
         <child>
           <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">True</property>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">False</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>
@@ -84,7 +82,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">True</property>
+        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
       </object>
     </child>
   </object>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index 75814351c4..29cb4af3c2 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window">
@@ -53,7 +51,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Font Features</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="weight" value="bold"></attribute>
                             </attributes>
                           </object>
                         </child>
@@ -84,7 +82,7 @@
                             <property name="label" translatable="yes">Font Variations</property>
                             <property name="xalign">0</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="weight" value="bold"></attribute>
                             </attributes>
                           </object>
                         </child>
@@ -115,31 +113,35 @@
             <child>
               <object class="GtkStack" id="stack">
                 <child>
-                  <object class="GtkLabel" id="label">
-                    <property name="wrap">1</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="valign">start</property>
-                    <property name="selectable">1</property>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">label</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkLabel" id="label">
+                        <property name="wrap">1</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="valign">start</property>
+                        <property name="selectable">1</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="entry">
-                    <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
+                  <object class="GtkStackPage">
+                    <property name="name">entry</property>
+                    <property name="child">
+                      <object class="GtkEntry" id="entry">
+                        <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
 
 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
 
 Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                    <signal name="activate" handler="stop_edit"/>
-                    <property name="valign">start</property>
-                    <property name="width-chars">50</property>
+                        <signal name="activate" handler="stop_edit"/>
+                        <property name="valign">start</property>
+                        <property name="width-chars">50</property>
+                      </object>
+                    </property>
                   </object>
-                  <packing>
-                    <property name="name">entry</property>
-                  </packing>
                 </child>
               </object>
             </child>
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index f6c79c1d7a..60c259a458 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
-  <!-- interface-requires gtkdemo 3.10 -->
   <object class="GtkMenu" id="menu1">
     <child>
       <object class="GtkMenuItem" id="menuitem1">
@@ -53,7 +50,7 @@
                     <property name="valign">baseline</property>
                     <property name="label" translatable="0">Username</property>
                     <attributes>
-                      <attribute name="weight" value="bold"/>
+                      <attribute name="weight" value="bold"></attribute>
                     </attributes>
                   </object>
                 </child>
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index ca72814342..e86c3af13a 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkTreeStore" id="treestore">
     <columns>
-      <!-- column-name NAME -->
       <column type="gchararray"/>
-      <!-- column-name TITLE -->
       <column type="gchararray"/>
-      <!-- column-name FILENAME -->
       <column type="gchararray"/>
-      <!-- column-name FUNC -->
       <column type="gpointer"/>
-      <!-- column-name STYLE -->
       <column type="gint"/>
     </columns>
   </object>
   <object class="GtkApplicationWindow" id="window">
-    <style><class name="devel"/></style>
+    <style>
+      <class name="devel"/>
+    </style>
     <property name="default-width">800</property>
     <property name="default-height">600</property>
     <property name="title">GTK Demo</property>
diff --git a/demos/gtk-demo/menus.ui b/demos/gtk-demo/menus.ui
index 16ca40bad9..ace0974da0 100644
--- a/demos/gtk-demo/menus.ui
+++ b/demos/gtk-demo/menus.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <interface>
   <menu id="appmenu">
     <section>
diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui
index da74fdba0b..2e7e11bec2 100644
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window1">
     <child type="titlebar">
       <object class="GtkHeaderBar">
@@ -56,7 +54,7 @@
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.color</property>
-            <property name="action-target">'red'</property>
+            <property name="action-target">&apos;red&apos;</property>
             <property name="text">Red</property>
             <property name="inverted">1</property>
           </object>
@@ -64,7 +62,7 @@
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.color</property>
-            <property name="action-target">'green'</property>
+            <property name="action-target">&apos;green&apos;</property>
             <property name="text">Green</property>
             <property name="inverted">1</property>
           </object>
@@ -72,7 +70,7 @@
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.color</property>
-            <property name="action-target">'blue'</property>
+            <property name="action-target">&apos;blue&apos;</property>
             <property name="text">Blue</property>
             <property name="inverted">1</property>
           </object>
@@ -99,8 +97,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkSeparator">
-          </object>
+          <object class="GtkSeparator"/>
         </child>
         <child>
           <object class="GtkModelButton">
diff --git a/demos/gtk-demo/popover.ui b/demos/gtk-demo/popover.ui
index b9a9bfa123..03ab8d966b 100644
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Nov 13 16:45:55 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Name -->
       <column type="gchararray"/>
     </columns>
     <data>
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui
index 3805569b04..850786cf6d 100644
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window">
     <property name="default-width">300</property>
     <property name="default-height">300</property>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index 7654044186..98fc717cfd 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">4</property>
     <property name="value">2</property>
@@ -76,11 +74,11 @@
             <property name="adjustment">adjustment2</property>
             <property name="hexpand">1</property>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <accessibility>
               <relation type="labelled-by" target="label_marks"/>
@@ -116,11 +114,11 @@
               <relation type="labelled-by" target="label_discrete"/>
             </accessibility>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
           </object>
           <packing>
diff --git a/demos/gtk-demo/shortcuts-boxes.ui b/demos/gtk-demo/shortcuts-boxes.ui
index f7d3c5ca1a..72cb194f4b 100644
--- a/demos/gtk-demo/shortcuts-boxes.ui
+++ b/demos/gtk-demo/shortcuts-boxes.ui
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.17 -->
   <object class="GtkShortcutsWindow" id="shortcuts-boxes">
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
         <property name="section-name">shortcuts</property>
         <property name="max-height">12</property>
-        <!-- Overview shortcuts -->
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes">Overview</property>
@@ -44,12 +41,10 @@
             </child>
           </object>
         </child>
-        <!-- Wizard and Properties shortcuts -->
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes">Box Creation and Properties</property>
             <property name="view">wizard</property>
-            <!-- LTR -->
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="direction">ltr</property>
@@ -64,7 +59,6 @@
                 <property name="title" translatable="yes">Switch to the previous page</property>
               </object>
             </child>
-            <!-- RTL -->
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="direction">rtl</property>
@@ -81,7 +75,6 @@
             </child>
           </object>
         </child>
-        <!-- Display shortcuts -->
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes">Box Display</property>
@@ -92,7 +85,6 @@
                 <property name="title" translatable="yes">Grab/Ungrab keyboard</property>
               </object>
             </child>
-            <!-- LTR -->
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="direction">ltr</property>
@@ -100,7 +92,6 @@
                 <property name="title" translatable="yes">Back to overview</property>
               </object>
             </child>
-            <!-- RTL -->
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="direction">rtl</property>
diff --git a/demos/gtk-demo/shortcuts-builder.ui b/demos/gtk-demo/shortcuts-builder.ui
index 6ae6646652..cfdaef7e26 100644
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.17 -->
   <object class="GtkShortcutsWindow" id="shortcuts-builder">
     <property name="modal">1</property>
     <child>
diff --git a/demos/gtk-demo/shortcuts-clocks.ui b/demos/gtk-demo/shortcuts-clocks.ui
index f8ba3057c3..f0eeea2d5b 100644
--- a/demos/gtk-demo/shortcuts-clocks.ui
+++ b/demos/gtk-demo/shortcuts-clocks.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.17 -->
   <object class="GtkShortcutsWindow" id="shortcuts-clocks">
     <property name="modal">1</property>
     <child>
diff --git a/demos/gtk-demo/shortcuts-gedit.ui b/demos/gtk-demo/shortcuts-gedit.ui
index f0ffa19978..2412948871 100644
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.17 -->
   <object class="GtkShortcutsWindow" id="shortcuts-gedit">
     <property name="modal">1</property>
     <child>
diff --git a/demos/gtk-demo/shortcuts.ui b/demos/gtk-demo/shortcuts.ui
index f846c2c5ed..5529fff4f3 100644
--- a/demos/gtk-demo/shortcuts.ui
+++ b/demos/gtk-demo/shortcuts.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.17 -->
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Shortcuts</property>
     <child>
diff --git a/demos/gtk-demo/spinbutton.ui b/demos/gtk-demo/spinbutton.ui
index 384f786f69..cd49a138d1 100644
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkAdjustment" id="basic_adjustment">
     <property name="lower">-10000</property>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index e395182ff5..d9b2aac44c 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Stack</property>
     <child>
@@ -20,38 +18,44 @@
             <property name="can-focus">1</property>
             <property name="transition-type">crossfade</property>
             <child>
-              <object class="GtkImage">
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
-                <property name="icon-name">gtk3-demo</property>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">page1</property>
                 <property name="title" translatable="yes">Page 1</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkImage">
+                    <property name="margin-top">20</property>
+                    <property name="margin-bottom">20</property>
+                    <property name="icon-name">gtk3-demo</property>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkCheckButton">
-                <property name="label" translatable="yes">Page 2</property>
-                <property name="can-focus">1</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">page2</property>
                 <property name="title" translatable="yes">Page 2</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkCheckButton">
+                    <property name="label" translatable="yes">Page 2</property>
+                    <property name="can-focus">1</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkSpinner">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="active">1</property>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">page3</property>
                 <property name="icon-name">face-laugh-symbolic</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkSpinner">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="active">1</property>
+                  </object>
+                </property>
+              </object>
             </child>
           </object>
           <packing>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index e601b23d3e..dfcb83f77a 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkGrid" id="grid">
     <property name="row-spacing">10</property>
diff --git a/demos/icon-browser/menus.ui b/demos/icon-browser/menus.ui
index 1a0f0c5365..795cdb5180 100644
--- a/demos/icon-browser/menus.ui
+++ b/demos/icon-browser/menus.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="app-menu">
     <section>
       <item>
diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index 1bbe6a3402..50b6efd1b3 100644
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <object class="IconStore" id="store"/>
   <object class="GtkTreeModelFilter" id="filter_model">
     <property name="child-model">store</property>
   </object>
   <template class="IconBrowserWindow" parent="GtkApplicationWindow">
-    <style><class name="devel"/></style>
+    <style>
+      <class name="devel"/>
+    </style>
     <property name="title" translatable="yes">Icon Browser</property>
     <property name="default-width">1024</property>
     <property name="default-height">768</property>
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index e9cd3c3a7d..6bfb68d623 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -556,7 +556,7 @@ set_needs_attention (GtkWidget *page, gboolean needs_attention)
   GtkWidget *stack;
 
   stack = gtk_widget_get_parent (page);
-  gtk_container_child_set (GTK_CONTAINER (stack), page,
+  g_object_set (gtk_stack_get_page (GTK_STACK (stack), page),
                            "needs-attention", needs_attention,
                            NULL);
 }
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index f9a1691101..54a082aaeb 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="gear_menu">
     <section>
       <item>
@@ -134,15 +132,10 @@
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
-      <!-- column-name Cool -->
       <column type="gboolean"/>
-      <!-- column-name Icon -->
       <column type="gchararray"/>
-      <!-- column-name Name -->
       <column type="gchararray"/>
-      <!-- column-name Nick -->
       <column type="gchararray"/>
-      <!-- column-name isRadio -->
       <column type="gboolean"/>
     </columns>
     <data>
@@ -406,7 +399,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     </columns>
   </object>
   <object class="GtkApplicationWindow" id="window">
-    <style><class name="devel"/></style>
+    <style>
+      <class name="devel"/>
+    </style>
     <property name="title">GTK Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
@@ -436,2065 +431,83 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
           <object class="GtkStack" id="toplevel_stack">
             <property name="transition-duration">30000</property>
             <child>
-              <object class="GtkBox" id="page1">
-                <property name="orientation">vertical</property>
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkBox" id="box2">
+              <object class="GtkStackPage">
+                <property name="name">page1</property>
+                <property name="title" translatable="yes">Page 1</property>
+                <property name="child">
+                  <object class="GtkBox" id="page1">
+                    <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
-                      <object class="GtkBox" id="box3">
-                        <property name="orientation">vertical</property>
+                      <object class="GtkBox" id="box2">
                         <property name="spacing">10</property>
                         <child>
-                          <object class="GtkComboBoxText" id="comboboxtext1">
-                            <property name="has-entry">1</property>
-                            <child internal-child="entry">
-                              <object class="GtkEntry" id="comboboxtext-entry">
-                                <property name="text" translatable="yes">comboboxentry</property>
-                              </object>
-                            </child>
-                            <items>
-                              <item>Donald Duck</item>
-                              <item>Mickey Mouse</item>
-                              <item>Jet McQuack</item>
-                            </items>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="comboboxtext2">
-                            <property name="sensitive">0</property>
-                            <property name="has-entry">1</property>
-                            <child internal-child="entry">
-                              <object class="GtkEntry" id="comboboxtext-entry2">
-                                <property name="invisible-char">•</property>
-                                <property name="text" translatable="yes">comboboxentry</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry1">
-                            <property name="can-focus">1</property>
-                            <property name="enable-emoji-completion">1</property>
-                            <property name="invisible_char">•</property>
-                            <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
-                            <property name="secondary-icon-name">view-refresh-symbolic</property>
-                            <property name="secondary-icon-tooltip-text">Change mode</property>
-                            <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry2">
-                            <property name="sensitive">0</property>
-                            <property name="can-focus">1</property>
-                            <property name="invisible-char">•</property>
-                            <property name="text" translatable="yes">entry</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box223">
-                            <style>
-                              <class name="linked"/>
-                            </style>
+                          <object class="GtkBox" id="box3">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
                             <child>
-                              <object class="GtkEntry" id="entry24">
+                              <object class="GtkComboBoxText" id="comboboxtext1">
+                                <property name="has-entry">1</property>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="comboboxtext-entry">
+                                    <property name="text" translatable="yes">comboboxentry</property>
+                                  </object>
+                                </child>
+                                <items>
+                                  <item>Donald Duck</item>
+                                  <item>Mickey Mouse</item>
+                                  <item>Jet McQuack</item>
+                                </items>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="comboboxtext2">
+                                <property name="sensitive">0</property>
+                                <property name="has-entry">1</property>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="comboboxtext-entry2">
+                                    <property name="invisible-char">•</property>
+                                    <property name="text" translatable="yes">comboboxentry</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry1">
+                                <property name="can-focus">1</property>
+                                <property name="enable-emoji-completion">1</property>
+                                <property name="invisible_char">•</property>
+                                <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
+                                <property name="secondary-icon-name">view-refresh-symbolic</property>
+                                <property name="secondary-icon-tooltip-text">Change mode</property>
+                                <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry2">
+                                <property name="sensitive">0</property>
                                 <property name="can-focus">1</property>
                                 <property name="invisible-char">•</property>
                                 <property name="text" translatable="yes">entry</property>
-                                <property name="hexpand">1</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkButton" id="button224">
-                                <property name="can-focus">1</property>
-                                <property name="icon-name">window-close-symbolic</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="hexpand">0</property>
-                            <style>
-                              <class name="linked"/>
-                            </style>
-                            <child>
-                              <object class="GtkComboBox">
-                                <property name="model">lrmodel</property>
-                                <property name="active">0</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkCellRendererText"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox">
-                                <property name="model">lrmodel</property>
-                                <property name="active">1</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkCellRendererText"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox">
-                                <property name="model">lrmodel</property>
-                                <property name="active">2</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkCellRendererText"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box18">
-                            <property name="spacing">20</property>
-                            <child>
-                              <object class="GtkLabel" id="label3">
-                                <property name="label" translatable="yes">label</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label4">
-                                <property name="sensitive">0</property>
-                                <property name="label" translatable="yes">label</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="spinbutton1">
-                                <property name="can-focus">1</property>
-                                <property name="width-chars">2</property>
-                                <property name="max-width-chars">2</property>
-                                <property name="adjustment">adjustment2</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="spinbutton2">
-                                <property name="can-focus">1</property>
-                                <property name="sensitive">0</property>
-                                <property name="width-chars">2</property>
-                                <property name="max-width-chars">2</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="grid1">
-                            <property name="row-homogeneous">1</property>
-                            <property name="column-spacing">18</property>
-                            <property name="row-spacing">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton1">
-                                <property name="label" translatable="yes">checkbutton</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton2">
-                                <property name="label" translatable="yes">checkbutton</property>
-                                <property name="can-focus">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton3">
-                                <property name="label" translatable="yes">checkbutton</property>
-                                <property name="inconsistent">1</property>
-                                <property name="can-focus">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton4">
-                                <property name="label" translatable="yes">checkbutton</property>
-                                <property name="sensitive">0</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton5">
-                                <property name="label" translatable="yes">checkbutton</property>
-                                <property name="sensitive">0</property>
-                                <property name="can-focus">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton6">
-                                <property name="label" translatable="yes">checkbutton</property>
-                                <property name="sensitive">0</property>
-                                <property name="inconsistent">1</property>
-                                <property name="can-focus">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">5</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton1">
-                                <property name="label" translatable="yes">radiobutton</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton2">
-                                <property name="label" translatable="yes">radiobutton</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                                <property name="group">radiobutton1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton3">
-                                <property name="label" translatable="yes">radiobutton</property>
-                                <property name="inconsistent">1</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                                <property name="group">radiobutton1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton4">
-                                <property name="label" translatable="yes">radiobutton</property>
-                                <property name="sensitive">0</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton5">
-                                <property name="label" translatable="yes">radiobutton</property>
-                                <property name="sensitive">0</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                                <property name="group">radiobutton3</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="radiobutton6">
-                                <property name="label" translatable="yes">radiobutton</property>
-                                <property name="sensitive">0</property>
-                                <property name="inconsistent">1</property>
-                                <property name="can-focus">1</property>
-                                <property name="active">1</property>
-                                <property name="group">radiobutton3</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">5</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinner" id="spinner1">
-                                <property name="active">1</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinner" id="spinner2"/>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinner" id="spinner3">
-                                <property name="active">1</property>
-                                <property name="sensitive">0</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinner" id="spinner4">
-                                <property name="sensitive">0</property>
-                              </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">4</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator1">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box19">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
-                        <child>
-                          <object class="GtkToggleButton" id="togglebutton1">
-                            <property name="label" translatable="yes">togglebutton</property>
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="togglebutton2">
-                            <property name="label" translatable="yes">togglebutton</property>
-                            <property name="sensitive">0</property>
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="togglebutton3">
-                            <property name="label" translatable="yes">togglebutton</property>
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                            <property name="active">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="togglebutton4">
-                            <property name="label" translatable="yes">togglebutton</property>
-                            <property name="sensitive">0</property>
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                            <property name="active">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="combobox1">
-                            <property name="model">liststore1</property>
-                            <property name="active">0</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="combobox2">
-                            <property name="sensitive">0</property>
-                            <property name="model">liststore1</property>
-                            <property name="active">1</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFontButton" id="fontbutton1">
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                            <property name="level">family|style|size|features|variations</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="colorbutton1">
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                            <property name="rgba">#31316867a09f</property>
-                            <property name="use-alpha">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFileChooserButton" id="filechooserbutton1">
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLinkButton" id="linkbutton1">
-                            <property name="label" translatable="yes">link button</property>
-                            <property name="can-focus">1</property>
-                            <property name="receives-default">1</property>
-                            <property name="has-tooltip">1</property>
-                            <property name="relief">none</property>
-                            <property name="uri">http://www.gtk.org</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSwitch" id="switch1">
-                            <property name="halign">center</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSwitch" id="switch2">
-                            <property name="sensitive">0</property>
-                            <property name="halign">center</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator2">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box20">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <property name="hexpand">1</property>
-                        <child>
-                          <object class="GtkBox" id="box21">
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkProgressBar" id="progressbar1">
-                                <property name="fraction">0.5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkProgressBar" id="progressbar2">
-                                <property name="fraction">0.5</property>
-                                <property name="inverted">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkProgressBar" id="progressbar3">
-                                <property name="fraction">0.5</property>
-                                <property name="show-text">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLevelBar" id="levelbar1">
-                                <property name="value">0.6</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLevelBar" id="levelbar2">
-                                <property name="max-value">5</property>
-                                <property name="value">2</property>
-                                <property name="mode">1</property>
-                                <offsets>
-                                  <offset name="low" value="1"/>
-                                  <offset name="high" value="4"/>
-                                  <offset name="full" value="5"/>
-                                </offsets>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box27">
-                            <child>
-                              <object class="GtkBox" id="box24">
-                                <property name="hexpand">1</property>
-                                <property name="orientation">vertical</property>
-                                <property name="homogeneous">1</property>
-                                <child>
-                                  <object class="GtkScale" id="scale1">
-                                    <property name="can-focus">1</property>
-                                    <property name="adjustment">adjustment1</property>
-                                    <property name="restrict-to-fill-level">0</property>
-                                    <property name="fill-level">75</property>
-                                    <property name="draw-value">0</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkScale" id="scale2">
-                                    <property name="sensitive">0</property>
-                                    <property name="can-focus">1</property>
-                                    <property name="adjustment">adjustment1</property>
-                                    <property name="restrict-to-fill-level">0</property>
-                                    <property name="fill-level">75</property>
-                                    <property name="draw-value">0</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale" id="scale5">
-                            <property name="can-focus">1</property>
-                            <property name="draw-value">0</property>
-                            <property name="has-origin">0</property>
-                            <property name="round-digits">0</property>
-                            <property name="adjustment">adjustment3</property>
-                            <property name="restrict-to-fill-level">0</property>
-                            <marks>
-                              <mark value="0" position="bottom"></mark>
-                              <mark value="1" position="bottom"></mark>
-                              <mark value="2" position="bottom"></mark>
-                              <mark value="3" position="bottom"></mark>
-                              <mark value="4" position="bottom"></mark>
-                            </marks>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box25">
-                            <property name="homogeneous">1</property>
-                            <child>
-                              <object class="GtkBox" id="box28">
-                                <property name="vexpand">1</property>
-                                <property name="spacing">6</property>
-                                <property name="homogeneous">1</property>
-                                <child>
-                                  <object class="GtkProgressBar" id="progressbar5">
-                                    <property name="orientation">vertical</property>
-                                    <property name="fraction">0.5</property>
-                                    <property name="halign">end</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkProgressBar" id="progressbar6">
-                                    <property name="orientation">vertical</property>
-                                    <property name="fraction">0.5</property>
-                                    <property name="inverted">1</property>
-                                    <property name="halign">start</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box23">
-                                <property name="vexpand">1</property>
-                                <property name="spacing">6</property>
-                                <property name="homogeneous">1</property>
-                                <child>
-                                  <object class="GtkScale" id="scale3">
-                                    <property name="height-request">100</property>
-                                    <property name="can-focus">1</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="adjustment">adjustment1</property>
-                                    <property name="restrict-to-fill-level">0</property>
-                                    <property name="fill-level">75</property>
-                                    <property name="digits">-1</property>
-                                    <property name="halign">end</property>
-                                    <signal name="format-value" handler="scale_format_value"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkScale" id="scale4">
-                                    <property name="height-request">100</property>
-                                    <property name="sensitive">0</property>
-                                    <property name="can-focus">1</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="adjustment">adjustment1</property>
-                                    <property name="restrict-to-fill-level">0</property>
-                                    <property name="fill-level">75</property>
-                                    <property name="digits">-1</property>
-                                    <property name="halign">start</property>
-                                    <signal name="format-value" handler="scale_format_value_blank"/>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator3">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box26">
-                        <property name="orientation">vertical</property>
-                        <property name="homogeneous">1</property>
-                        <property name="spacing">6</property>
-                        <property name="hexpand">1</property>
-                        <child>
-                          <object class="GtkFrame" id="frame1">
-                            <style>
-                              <class name="border-inset"/>
-                            </style>
-                            <child type="label">
-                              <object class="GtkLabel" id="label1">
-                                <property name="label" translatable="yes">&lt;b&gt;Inset&lt;/b&gt;</property>
-                                <property name="use-markup">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame2">
-                            <style>
-                              <class name="border-outset"/>
-                            </style>
-                            <child type="label">
-                              <object class="GtkLabel" id="label2">
-                                <property name="label" translatable="yes">&lt;b&gt;Outset&lt;/b&gt;</property>
-                                <property name="use-markup">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame3">
-                            <style>
-                              <class name="border-groove"/>
-                            </style>
-                            <child type="label">
-                              <object class="GtkLabel" id="label17">
-                                <property name="label" translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
-                                <property name="use-markup">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame4">
-                            <style>
-                              <class name="border-ridge"/>
-                            </style>
-                            <child type="label">
-                              <object class="GtkLabel" id="label18">
-                                <property name="label" translatable="yes">&lt;b&gt;Ridge&lt;/b&gt;</property>
-                                <property name="use-markup">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator4">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box4">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <property name="hexpand">1</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="width-request">150</property>
-                            <property name="can-focus">1</property>
-                            <property name="vscrollbar-policy">always</property>
-                            <property name="shadow-type">in</property>
-                            <property name="vexpand">1</property>
-                            <child>
-                              <object class="GtkTreeView" id="treeview1">
-                                <property name="can-focus">1</property>
-                                <property name="model">liststore1</property>
-                                <property name="headers-clickable">0</property>
-                                <property name="search-column">0</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="treeview-selection"/>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn3">
-                                    <property name="title" translatable="yes">Cool</property>
-                                    <child>
-                                      <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
-                                      <attributes>
-                                        <attribute name="active">0</attribute>
-                                        <attribute name="radio">4</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn4">
-                                    <property name="title" translatable="yes">Icon</property>
-                                    <property name="reorderable">1</property>
-                                    <child>
-                                      <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
-                                      <attributes>
-                                        <attribute name="icon_name">1</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                                    <property name="title" translatable="yes">Name</property>
-                                    <property name="resizable">1</property>
-                                    <property name="reorderable">1</property>
-                                    <property name="sort-indicator">1</property>
-                                    <property name="sort-column-id">2</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext3">
-                                        <property name="ellipsize">end</property>
-                                      </object>
-                                      <attributes>
-                                        <attribute name="text">2</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                                    <property name="title" translatable="yes">Nick</property>
-                                    <property name="resizable">1</property>
-                                    <property name="reorderable">1</property>
-                                    <property name="sort-indicator">1</property>
-                                    <property name="sort-column-id">3</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext4">
-                                        <property name="ellipsize">end</property>
-                                      </object>
-                                      <attributes>
-                                        <attribute name="text">3</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="can-focus">1</property>
-                            <property name="shadow-type">in</property>
-                            <property name="vexpand">1</property>
-                            <child>
-                              <object class="GtkTextView" id="textview1">
-                                <property name="can-focus">1</property>
-                                <property name="buffer">textbuffer1</property>
-                                <property name="wrap-mode">2</property>
-                                <property name="left-margin">10</property>
-                                <property name="right-margin">10</property>
-                                <property name="populate-all">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator5"/>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box5">
-                    <property name="spacing">10</property>
-                    <property name="homogeneous">1</property>
-                    <child>
-                      <object class="GtkNotebook" id="notebook1">
-                        <property name="can-focus">1</property>
-                        <child>
-                          <object class="GtkBox" id="box6">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label5">
-                            <property name="label" translatable="yes">page 1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box7">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label6">
-                            <property name="label" translatable="yes">page 2</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box8">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label7">
-                            <property name="label" translatable="yes">page 3</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkNotebook" id="notebook2">
-                        <property name="can-focus">1</property>
-                        <property name="tab-pos">right</property>
-                        <child>
-                          <object class="GtkBox" id="box9">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label8">
-                            <property name="label" translatable="yes">page 1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box10">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label9">
-                            <property name="label" translatable="yes">page 2</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box11">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label10">
-                            <property name="label" translatable="yes">page 3</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkNotebook" id="notebook3">
-                        <property name="can-focus">1</property>
-                        <property name="tab-pos">bottom</property>
-                        <child>
-                          <object class="GtkBox" id="box12">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label11">
-                            <property name="label" translatable="yes">page 1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box13">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label12">
-                            <property name="label" translatable="yes">page 2</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box14">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label13">
-                            <property name="label" translatable="yes">page 3</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkNotebook" id="notebook4">
-                        <property name="can-focus">1</property>
-                        <property name="tab-pos">left</property>
-                        <child>
-                          <object class="GtkBox" id="box15">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label14">
-                            <property name="label" translatable="yes">page 1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box16">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label15">
-                            <property name="label" translatable="yes">page 2</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box17">
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel" id="label16">
-                            <property name="label" translatable="yes">page 3</property>
-                          </object>
-                          <packing>
-                            <property name="position">2</property>
-                            <property name="tab-fill">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Page 1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkOverlay" id="page2">
-                <child type="overlay">
-                  <object class="GtkRevealer" id="page2revealer">
-                    <property name="halign">center</property>
-                    <property name="valign">start</property>
-                    <child>
-                      <object class="GtkFrame" id="page2frame">
-                        <style>
-                          <class name="app-notification"/>
-                        </style>
-                        <child>
-                          <object class="GtkBox" id="page2box">
-                            <property name="spacing">20</property>
-                            <property name="margin">10</property>
-                            <child>
-                              <object class="GtkLabel" id="page2note">
-                                <property name="hexpand">1</property>
-                                <property name="halign">start</property>
-                                <property name="label">NEWS!</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="page2reset">
-                                <property name="valign">center</property>
-                                <property name="label" translatable="yes">Reset</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="page2dismiss">
-                                <property name="focus-on-click">0</property>
-                                <property name="relief">none</property>
-                                <property name="icon-name">window-close-symbolic</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="spacing">10</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkSpinButton" id="verticalspin1">
-                                <property name="orientation">vertical</property>
-                                <property name="adjustment">adjustment2</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="verticalspin2">
-                                <property name="sensitive">0</property>
-                                <property name="orientation">vertical</property>
-                                <property name="adjustment">adjustment2</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGrid">
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">6</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="GtkVolumeButton">
-                                    <property name="orientation">vertical</property>
-                                    <property name="valign">center</property>
-                                    <property name="value">.5</property>
-                                    <property name="halign">center</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkScaleButton" id="mic-button">
-                                    <property name="has-tooltip">1</property>
-                                    <property name="icons">microphone-sensitivity-muted-symbolic
-microphone-sensitivity-high-symbolic
-microphone-sensitivity-low-symbolic
-microphone-sensitivity-medium-symbolic</property>
-                                    <property name="valign">center</property>
-                                    <property name="value">.5</property>
-                                    <property name="halign">center</property>
-                                    <signal name="query-tooltip" handler="on_scale_button_query_tooltip" swapped="no"/>
-                                    <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
-                                  </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="page2frame1">
-                            <child>
-                              <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkStack" id="stack">
-                                    <property name="transition-type">crossfade</property>
-                                    <property name="transition-duration">1000</property>
-                                    <child>
-                                      <object class="GtkScrolledWindow" id="swo">
-                                        <property name="hscrollbar-policy">never</property>
-                                        <child>
-                                          <object class="GtkTextView" id="tvo">
-                                            <property name="can-focus">1</property>
-                                            <property name="buffer">textbuffer2</property>
-                                            <property name="left-margin">10</property>
-                                            <property name="right-margin">10</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="name">page1</property>
-                                        <property name="icon-name">preferences-desktop-locale-symbolic</property>
-                                        <property name="title">News</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage" id="imageo">
-                                        <property name="icon-name">gtk3-widget-factory</property>
-                                        <property name="pixel-size">256</property>
-                                      </object>
-                                      <packing>
-                                        <property name="name">page2</property>
-                                        <property name="icon-name">folder-pictures-symbolic</property>
-                                        <property name="title">Logo</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkActionBar" id="actionbar1">
-                                    <child type="center">
-                                      <object class="GtkStackSwitcher" id="switcher">
-                                        <property name="stack">stack</property>
-                                        <property name="halign">center</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <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>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
-                        <child>
-                          <object class="GtkScrolledWindow">
-                            <property name="shadow-type">in</property>
-                            <property name="hscrollbar-policy">never</property>
-                            <property name="min-content-height">200</property>
-                            <property name="hexpand">0</property>
-                            <child>
-                              <object class="GtkListBox" id="listbox">
-                                <property name="selection-mode">none</property>
-                                <child type="placeholder">
-                                  <object class="GtkLabel">
-                                    <property name="label">No rows found</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="listboxrow1">
-                                    <property name="activatable">0</property>
-                                    <property name="selectable">0</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Row 1</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin">6</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="listboxrow1switch">
-                                            <property name="halign">end</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin-top">6</property>
-                                            <property name="margin-bottom">6</property>
-                                            <property name="margin-start">12</property>
-                                            <property name="margin-end">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="listboxrow2">
-                                    <property name="activatable">0</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Row 2</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin">6</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkScale">
-                                            <property name="halign">end</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin-top">6</property>
-                                            <property name="margin-bottom">6</property>
-                                            <property name="margin-start">12</property>
-                                            <property name="margin-end">12</property>
-                                            <property name="draw-value">0</property>
-                                            <property name="width-request">150</property>
-                                            <property name="adjustment">adjustment1</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="listboxrow3">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Row 3</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin">6</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage" id="listboxrow3image">
-                                            <property name="icon-name">object-select-symbolic</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin-top">6</property>
-                                            <property name="margin-bottom">6</property>
-                                            <property name="margin-start">12</property>
-                                            <property name="margin-end">12</property>
-                                            <property name="opacity">0</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="listboxrow4">
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Row 4</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin">6</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <property name="icon-name">object-select-symbolic</property>
-                                            <property name="halign">end</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin-top">6</property>
-                                            <property name="margin-bottom">6</property>
-                                            <property name="margin-start">12</property>
-                                            <property name="margin-end">12</property>
-                                            <property name="opacity">0</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="listboxrow5">
-                                    <property name="activatable">0</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Row 5</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin">6</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton" id="listboxrow5button">
-                                            <property name="halign">end</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin-top">6</property>
-                                            <property name="margin-bottom">6</property>
-                                            <property name="margin-start">12</property>
-                                            <property name="margin-end">12</property>
-                                            <property name="icon-name">appointment-soon-symbolic</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkListBoxRow" id="listboxrow6">
-                                    <property name="activatable">0</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Row 6</property>
-                                            <property name="halign">start</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin">6</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkCheckButton">
-                                            <property name="halign">end</property>
-                                            <property name="valign">center</property>
-                                            <property name="margin-top">6</property>
-                                            <property name="margin-bottom">6</property>
-                                            <property name="margin-start">12</property>
-                                            <property name="margin-end">12</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
-                        <child>
-                          <object class="GtkFrame" id="page2frame2">
-                            <child>
-                              <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkMenuBar">
-                                    <child>
-                                      <object class="GtkMenuItem" id="menuitem1">
-                                        <property name="label" translatable="yes">_File</property>
-                                        <property name="use-underline">1</property>
-                                        <child type="submenu">
-                                          <object class="GtkMenu" id="menu1">
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem101">
-                                                <property name="label" translatable="yes">_New</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem102">
-                                                <property name="label" translatable="yes">_Open</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem103">
-                                                <property name="label" translatable="yes">_Save</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem104">
-                                                <property name="label" translatable="yes">Save _As</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSeparatorMenuItem" id="separatormenuitem1"/>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="quitmenuitem">
-                                                <property name="label" translatable="yes">_Quit</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">app.quit</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuItem" id="menuitem2">
-                                        <property name="label" translatable="yes">_Edit</property>
-                                        <property name="use-underline">1</property>
-                                        <child type="submenu">
-                                          <object class="GtkMenu" id="menu2">
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem106">
-                                                <property name="label" translatable="yes">Cu_t</property>
-                                                <property name="can-focus">1</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem107">
-                                                <property name="label" translatable="yes">_Copy</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="menuitem108">
-                                                <property name="label" translatable="yes">_Paste</property>
-                                                <property name="use-underline">1</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="deletemenuitem">
-                                                <property name="label" translatable="yes">_Delete</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">win.delete</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="searchmenuitem">
-                                                <property name="label" translatable="yes">_Search</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">win.search</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="togglesmenuitem">
-                                                <property name="label">Checks &amp; Radios</property>
-                                                <property name="use-underline">1</property>
-                                                <child type="submenu">
-                                                  <object class="GtkMenu" id="togglessubmenu">
-                                                    <child>
-                                                      <object class="GtkCheckMenuItem" id="checkmenuitem1">
-                                                        <property name="label">_Check</property>
-                                                        <property name="active">1</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkCheckMenuItem" id="checkmenuitem2">
-                                                        <property name="label">_Check</property>
-                                                        <property name="active">1</property>
-                                                        <property name="sensitive">0</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkCheckMenuItem" id="checkmenuitem3">
-                                                        <property name="label">_Check</property>
-                                                        <property name="inconsistent">1</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkCheckMenuItem" id="checkmenuitem4">
-                                                        <property name="label">_Check</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkCheckMenuItem" id="checkmenuitem5">
-                                                        <property name="label">_Check</property>
-                                                        <property name="sensitive">0</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkCheckMenuItem" id="checkmenuitem6">
-                                                        <property name="label">_Check</property>
-                                                        <property name="inconsistent">1</property>
-                                                        <property name="sensitive">0</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkSeparatorMenuItem" id="separatormenuitem"/>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkRadioMenuItem" id="radiomenuitem1">
-                                                        <property name="label">_Radio</property>
-                                                        <property name="active">1</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkRadioMenuItem" id="radiomenuitem2">
-                                                        <property name="label">_Radio</property>
-                                                        <property name="active">1</property>
-                                                        <property name="sensitive">0</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkRadioMenuItem" id="radiomenuitem3">
-                                                        <property name="label">_Radio</property>
-                                                        <property name="inconsistent">1</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkRadioMenuItem" id="radiomenuitem4">
-                                                        <property name="label">_Radio</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkRadioMenuItem" id="radiomenuitem5">
-                                                        <property name="label">_Radio</property>
-                                                        <property name="sensitive">0</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkRadioMenuItem" id="radiomenuitem6">
-                                                        <property name="label">_Radio</property>
-                                                        <property name="inconsistent">1</property>
-                                                        <property name="sensitive">0</property>
-                                                        <property name="use-underline">1</property>
-                                                      </object>
-                                                    </child>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuItem" id="menuitem3">
-                                        <property name="label" translatable="yes">_View</property>
-                                        <property name="use-underline">1</property>
-                                        <child type="submenu">
-                                          <object class="GtkMenu" id="view-menu">
-                                            <child>
-                                              <object class="GtkCheckMenuItem" id="darkmenuitem">
-                                                <property name="label">_Dark theme</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">win.dark</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkCheckMenuItem" id="toolbarmenuitem">
-                                                <property name="label">_Toolbar</property>
-                                                <property name="active">1</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">win.toolbar</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkCheckMenuItem" id="statusbarmenuitem">
-                                                <property name="label">_Statusbar</property>
-                                                <property name="active">1</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">win.statusbar</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="bgmenuitem">
-                                                <property name="label">_Select Background</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">win.background</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuItem" id="menuitem4">
-                                        <property name="label" translatable="yes">_Help</property>
-                                        <property name="use-underline">1</property>
-                                        <child type="submenu">
-                                          <object class="GtkMenu" id="menu3">
-                                            <child>
-                                              <object class="GtkMenuItem" id="aboutmenuitem">
-                                                <property name="label" translatable="yes">_About</property>
-                                                <property name="use-underline">1</property>
-                                                <property name="action-name">app.about</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkToolbar" id="toolbar">
-                                    <child>
-                                      <object class="GtkToolButton">
-                                        <property name="label" translatable="yes">New</property>
-                                        <property name="icon-name">document-new</property>
-                                        <property name="tooltip-text" translatable="yes">Create a new document</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton">
-                                        <property name="label" translatable="yes">Save</property>
-                                        <property name="icon-name">document-save</property>
-                                        <property name="tooltip-text" translatable="yes">Save the current document</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSeparatorToolItem"/>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton">
-                                        <property name="label" translatable="yes">Search</property>
-                                        <property name="icon-name">edit-find</property>
-                                        <property name="action-name">win.search</property>
-                                        <property name="tooltip-text" translatable="yes">Search for it</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton">
-                                        <property name="sensitive">0</property>
-                                        <property name="label" translatable="yes">Insert</property>
-                                        <property name="icon-name">insert-image</property>
-                                        <property name="tooltip-text" translatable="yes">Insert something</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkSearchBar" id="searchbar">
-                                    <child>
-                                      <object class="GtkSearchEntry"/>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkInfoBar" id="infobar">
-                                    <property name="visible">0</property>
-                                    <property name="show-close-button">1</property>
-                                    <child internal-child="content_area">
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">You wanted to delete something.</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkScrolledWindow">
-                                    <property name="shadow-type">in</property>
-                                    <property name="vexpand">1</property>
-                                    <child>
-                                      <object class="MyTextView" id="text3">
-                                        <property name="visible">True</property>
-                                        <property name="can-focus">True</property>
-                                        <property name="buffer">textbuffer1</property>
-                                        <property name="wrap-mode">2</property>
-                                        <property name="left-margin">10</property>
-                                        <property name="right-margin">10</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkStatusbar" id="statusbar">
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkBox">
-                                <property name="spacing">10</property>
-                                <property name="expand">1</property>
-                                <child>
-                                  <object class="GtkFrame" id="panedframe1">
-                                    <property name="expand">1</property>
-                                    <child>
-                                      <object class="GtkPaned">
-                                        <style>
-                                          <class name="view"/>
-                                        </style>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Left</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Right</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkFrame" id="panedframe2">
-                                    <property name="expand">1</property>
-                                    <child>
-                                      <object class="GtkPaned">
-                                        <property name="orientation">vertical</property>
-                                        <style>
-                                          <class name="view"/>
-                                        </style>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Top</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Bottom</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="filler2">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
-                        <child>
-                          <object class="GtkCalendar">
-                            <property name="halign">center</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
-                        <child>
-                          <object class="GtkExpander" id="expander1">
-                            <property name="can-focus">1</property>
-                            <property name="expanded">1</property>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                    <property name="can-focus">1</property>
-                                    <property name="shadow-type">in</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="height-request">226</property>
-                                    <child>
-                                      <object class="GtkIconView" id="iconview1">
-                                        <property name="can-focus">1</property>
-                                        <property name="selection-mode">multiple</property>
-                                        <property name="model">iconsmodel</property>
-                                        <child>
-                                          <object class="GtkCellRendererPixbuf" id="iconviewcell"/>
-                                          <attributes>
-                                            <attribute name="icon-name">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkToolbar">
-                                    <property name="toolbar-style">icons</property>
-                                    <style>
-                                      <class name="inline-toolbar"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkToolButton" id="decrease_button">
-                                        <property name="icon-name">zoom-out-symbolic</property>
-                                        <property name="tooltip-text">Normal icons</property>
-                                        <signal name="clicked" handler="decrease_icon_size" object="iconview1" swapped="yes"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="increase_button">
-                                        <property name="icon-name">zoom-in-symbolic</property>
-                                        <property name="tooltip-text">Large icons</property>
-                                        <signal name="clicked" handler="increase_icon_size" object="iconview1" swapped="yes"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="reset_button">
-                                        <property name="icon-name">zoom-original-symbolic</property>
-                                        <property name="tooltip-text">Inherited icon size</property>
-                                        <signal name="clicked" handler="reset_icon_size" object="iconview1" swapped="yes"/>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label19">
-                                <property name="label" translatable="yes">Expander</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="info_dialog_button">
-                            <property name="label" translatable="yes">_Inform</property>
-                            <property name="use-underline">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="action_dialog_button">
-                            <property name="label" translatable="yes">_Act</property>
-                            <property name="use-underline">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="preference_dialog_button">
-                            <property name="label" translatable="yes">_Configure</property>
-                            <property name="use-underline">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="selection_dialog_button">
-                            <property name="label" translatable="yes">_Select</property>
-                            <property name="use-underline">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">Page 2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">10</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">4</property>
-                        <child>
-                          <object class="GtkScrolledWindow">
-                            <property name="hscrollbar-policy">never</property>
-                            <property name="vscrollbar-policy">always</property>
-                            <property name="height-request">300</property>
-                            <property name="shadow-type">in</property>
-                            <child>
-                              <object class="GtkTreeView" id="charletree">
-                                <property name="enable-grid-lines">vertical</property>
-                                <property name="enable-tree-lines">1</property>
-                                <property name="rubber-banding">1</property>
-                                <property name="model">charlemodel</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection">
-                                    <property name="mode">multiple</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn">
-                                    <property name="title" translatable="yes">Name</property>
-                                    <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn">
-                                    <property name="title" translatable="yes">Birth</property>
-                                    <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn">
-                                    <property name="title" translatable="yes">Death</property>
-                                    <child>
-                                      <object class="GtkCellRendererText"/>
-                                      <attributes>
-                                        <attribute name="text">2</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="selectable">1</property>
-                            <property name="halign">start</property>
-                            <property name="use-markup">1</property>
-                            <property name="label" translatable="yes">&lt;small&gt;Data source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Charlemagne#Ancestry&quot;&gt;Wikipedia&lt;/a&gt;&lt;/small&gt;</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator"/>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="hscrollbar-policy">never</property>
-                        <property name="vexpand">1</property>
-                        <property name="shadow-type">in</property>
-                        <child>
-                          <object class="GtkListBox" id="munsell">
-                            <property name="selection-mode">multiple</property>
-                            <property name="activate-on-single-click">0</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator">
-                    <property name="orientation">vertical</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">10</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="halign">start</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkBox" id="lockbox">
-                            <property name="halign">start</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkMenuButton" id="open_menubutton">
-                                <property name="halign">center</property>
-                                <property name="popover">open_popover</property>
+                              <object class="GtkBox" id="box223">
                                 <style>
-                                  <class name="text-button"/>
-                                  <class name="image-button"/>
+                                  <class name="linked"/>
                                 </style>
                                 <child>
-                                  <object class="GtkBox">
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="valign">baseline</property>
-                                        <property name="label">Open</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage">
-                                        <property name="valign">baseline</property>
-                                        <property name="icon-name">pan-down-symbolic</property>
-                                      </object>
-                                    </child>
+                                  <object class="GtkEntry" id="entry24">
+                                    <property name="can-focus">1</property>
+                                    <property name="invisible-char">•</property>
+                                    <property name="text" translatable="yes">entry</property>
+                                    <property name="hexpand">1</property>
                                   </object>
                                 </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkToggleButton" id="record_button">
-                                <property name="halign">center</property>
-                                <signal name="toggled" handler="on_record_button_toggled"/>
-                                <style>
-                                  <class name="text-button"/>
-                                  <class name="image-button"/>
-                                  <class name="destructive-action"/>
-                                </style>
                                 <child>
-                                  <object class="GtkBox">
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkImage">
-                                        <property name="valign">baseline</property>
-                                        <property name="icon-name">media-record-symbolic</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="valign">baseline</property>
-                                        <property name="label">Record</property>
-                                      </object>
-                                    </child>
+                                  <object class="GtkButton" id="button224">
+                                    <property name="can-focus">1</property>
+                                    <property name="icon-name">window-close-symbolic</property>
                                   </object>
                                 </child>
                               </object>
@@ -2505,596 +518,2591 @@ microphone-sensitivity-medium-symbolic</property>
                                   <class name="linked"/>
                                 </style>
                                 <child>
-                                  <object class="GtkRadioButton" id="grid_button">
-                                    <property name="draw-indicator">0</property>
-                                    <property name="active">1</property>
-                                    <property name="icon-name">view-grid-symbolic</property>
+                                  <object class="GtkComboBox">
+                                    <property name="model">lrmodel</property>
+                                    <property name="active">0</property>
+                                    <property name="hexpand">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="list_button">
+                                  <object class="GtkComboBox">
+                                    <property name="model">lrmodel</property>
                                     <property name="active">1</property>
-                                    <property name="draw-indicator">0</property>
-                                    <property name="group">grid_button</property>
-                                    <property name="icon-name">view-list-symbolic</property>
+                                    <property name="hexpand">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox">
+                                    <property name="model">lrmodel</property>
+                                    <property name="active">2</property>
+                                    <property name="hexpand">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererText"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkButton" id="circular_button">
-                                <property name="icon-name">emblem-system-symbolic</property>
+                              <object class="GtkBox" id="box18">
+                                <property name="spacing">20</property>
+                                <child>
+                                  <object class="GtkLabel" id="label3">
+                                    <property name="label" translatable="yes">label</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label4">
+                                    <property name="sensitive">0</property>
+                                    <property name="label" translatable="yes">label</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="spinbutton1">
+                                    <property name="can-focus">1</property>
+                                    <property name="width-chars">2</property>
+                                    <property name="max-width-chars">2</property>
+                                    <property name="adjustment">adjustment2</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="spinbutton2">
+                                    <property name="can-focus">1</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="width-chars">2</property>
+                                    <property name="max-width-chars">2</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid1">
+                                <property name="row-homogeneous">1</property>
+                                <property name="column-spacing">18</property>
+                                <property name="row-spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton1">
+                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton2">
+                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="can-focus">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton3">
+                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="inconsistent">1</property>
+                                    <property name="can-focus">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton4">
+                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton5">
+                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can-focus">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton6">
+                                    <property name="label" translatable="yes">checkbutton</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="inconsistent">1</property>
+                                    <property name="can-focus">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">0</property>
+                                    <property name="top-attach">5</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="radiobutton1">
+                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="radiobutton2">
+                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                    <property name="group">radiobutton1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="radiobutton3">
+                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="inconsistent">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                    <property name="group">radiobutton1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="radiobutton4">
+                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="radiobutton5">
+                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                    <property name="group">radiobutton3</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="radiobutton6">
+                                    <property name="label" translatable="yes">radiobutton</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="inconsistent">1</property>
+                                    <property name="can-focus">1</property>
+                                    <property name="active">1</property>
+                                    <property name="group">radiobutton3</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">1</property>
+                                    <property name="top-attach">5</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinner" id="spinner1">
+                                    <property name="active">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinner" id="spinner2"/>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinner" id="spinner3">
+                                    <property name="active">1</property>
+                                    <property name="sensitive">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinner" id="spinner4">
+                                    <property name="sensitive">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left-attach">2</property>
+                                    <property name="top-attach">4</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator1">
+                            <property name="orientation">vertical</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box19">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkToggleButton" id="togglebutton1">
+                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkToggleButton" id="togglebutton2">
+                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="sensitive">0</property>
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkToggleButton" id="togglebutton3">
+                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                                <property name="active">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkToggleButton" id="togglebutton4">
+                                <property name="label" translatable="yes">togglebutton</property>
+                                <property name="sensitive">0</property>
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                                <property name="active">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="combobox1">
+                                <property name="model">liststore1</property>
+                                <property name="active">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                                  <attributes>
+                                    <attribute name="text">2</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="combobox2">
+                                <property name="sensitive">0</property>
+                                <property name="model">liststore1</property>
+                                <property name="active">1</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                                  <attributes>
+                                    <attribute name="text">2</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFontButton" id="fontbutton1">
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                                <property name="level">family|style|size|features|variations</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkColorButton" id="colorbutton1">
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                                <property name="rgba">#31316867a09f</property>
+                                <property name="use-alpha">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFileChooserButton" id="filechooserbutton1"/>
+                            </child>
+                            <child>
+                              <object class="GtkLinkButton" id="linkbutton1">
+                                <property name="label" translatable="yes">link button</property>
+                                <property name="can-focus">1</property>
+                                <property name="receives-default">1</property>
+                                <property name="has-tooltip">1</property>
+                                <property name="relief">none</property>
+                                <property name="uri">http://www.gtk.org</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSwitch" id="switch1">
+                                <property name="halign">center</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSwitch" id="switch2">
+                                <property name="sensitive">0</property>
+                                <property name="halign">center</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator2">
+                            <property name="orientation">vertical</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box20">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
+                            <child>
+                              <object class="GtkBox" id="box21">
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkProgressBar" id="progressbar1">
+                                    <property name="fraction">0.5</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkProgressBar" id="progressbar2">
+                                    <property name="fraction">0.5</property>
+                                    <property name="inverted">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkProgressBar" id="progressbar3">
+                                    <property name="fraction">0.5</property>
+                                    <property name="show-text">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLevelBar" id="levelbar1">
+                                    <property name="value">0.6</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLevelBar" id="levelbar2">
+                                    <property name="max-value">5</property>
+                                    <property name="value">2</property>
+                                    <property name="mode">1</property>
+                                    <offsets>
+                                      <offset name="low" value="1"/>
+                                      <offset name="high" value="4"/>
+                                      <offset name="full" value="5"/>
+                                    </offsets>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box27">
+                                <child>
+                                  <object class="GtkBox" id="box24">
+                                    <property name="hexpand">1</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="homogeneous">1</property>
+                                    <child>
+                                      <object class="GtkScale" id="scale1">
+                                        <property name="can-focus">1</property>
+                                        <property name="adjustment">adjustment1</property>
+                                        <property name="restrict-to-fill-level">0</property>
+                                        <property name="fill-level">75</property>
+                                        <property name="draw-value">0</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="scale2">
+                                        <property name="sensitive">0</property>
+                                        <property name="can-focus">1</property>
+                                        <property name="adjustment">adjustment1</property>
+                                        <property name="restrict-to-fill-level">0</property>
+                                        <property name="fill-level">75</property>
+                                        <property name="draw-value">0</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkScale" id="scale5">
+                                <property name="can-focus">1</property>
+                                <property name="draw-value">0</property>
+                                <property name="has-origin">0</property>
+                                <property name="round-digits">0</property>
+                                <property name="adjustment">adjustment3</property>
+                                <property name="restrict-to-fill-level">0</property>
+                                <marks>
+                                  <mark value="0" position="bottom"/>
+                                  <mark value="1" position="bottom"/>
+                                  <mark value="2" position="bottom"/>
+                                  <mark value="3" position="bottom"/>
+                                  <mark value="4" position="bottom"/>
+                                </marks>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box25">
+                                <property name="homogeneous">1</property>
+                                <child>
+                                  <object class="GtkBox" id="box28">
+                                    <property name="vexpand">1</property>
+                                    <property name="spacing">6</property>
+                                    <property name="homogeneous">1</property>
+                                    <child>
+                                      <object class="GtkProgressBar" id="progressbar5">
+                                        <property name="orientation">vertical</property>
+                                        <property name="fraction">0.5</property>
+                                        <property name="halign">end</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkProgressBar" id="progressbar6">
+                                        <property name="orientation">vertical</property>
+                                        <property name="fraction">0.5</property>
+                                        <property name="inverted">1</property>
+                                        <property name="halign">start</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="box23">
+                                    <property name="vexpand">1</property>
+                                    <property name="spacing">6</property>
+                                    <property name="homogeneous">1</property>
+                                    <child>
+                                      <object class="GtkScale" id="scale3">
+                                        <property name="height-request">100</property>
+                                        <property name="can-focus">1</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="adjustment">adjustment1</property>
+                                        <property name="restrict-to-fill-level">0</property>
+                                        <property name="fill-level">75</property>
+                                        <property name="digits">-1</property>
+                                        <property name="halign">end</property>
+                                        <signal name="format-value" handler="scale_format_value"/>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="scale4">
+                                        <property name="height-request">100</property>
+                                        <property name="sensitive">0</property>
+                                        <property name="can-focus">1</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="adjustment">adjustment1</property>
+                                        <property name="restrict-to-fill-level">0</property>
+                                        <property name="fill-level">75</property>
+                                        <property name="digits">-1</property>
+                                        <property name="halign">start</property>
+                                        <signal name="format-value" handler="scale_format_value_blank"/>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator3">
+                            <property name="orientation">vertical</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box26">
+                            <property name="orientation">vertical</property>
+                            <property name="homogeneous">1</property>
+                            <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
+                            <child>
+                              <object class="GtkFrame" id="frame1">
+                                <style>
+                                  <class name="border-inset"/>
+                                </style>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label1">
+                                    <property name="label" translatable="yes">&lt;b&gt;Inset&lt;/b&gt;</property>
+                                    <property name="use-markup">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="frame2">
+                                <style>
+                                  <class name="border-outset"/>
+                                </style>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label2">
+                                    <property name="label" translatable="yes">&lt;b&gt;Outset&lt;/b&gt;</property>
+                                    <property name="use-markup">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="frame3">
+                                <style>
+                                  <class name="border-groove"/>
+                                </style>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label17">
+                                    <property name="label" translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
+                                    <property name="use-markup">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="frame4">
+                                <style>
+                                  <class name="border-ridge"/>
+                                </style>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label18">
+                                    <property name="label" translatable="yes">&lt;b&gt;Ridge&lt;/b&gt;</property>
+                                    <property name="use-markup">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator" id="separator4">
+                            <property name="orientation">vertical</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box4">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                                <property name="width-request">150</property>
+                                <property name="can-focus">1</property>
+                                <property name="vscrollbar-policy">always</property>
+                                <property name="shadow-type">in</property>
+                                <property name="vexpand">1</property>
+                                <child>
+                                  <object class="GtkTreeView" id="treeview1">
+                                    <property name="can-focus">1</property>
+                                    <property name="model">liststore1</property>
+                                    <property name="headers-clickable">0</property>
+                                    <property name="search-column">0</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection"/>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                                        <property name="title" translatable="yes">Cool</property>
+                                        <child>
+                                          <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
+                                          <attributes>
+                                            <attribute name="active">0</attribute>
+                                            <attribute name="radio">4</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                                        <property name="title" translatable="yes">Icon</property>
+                                        <property name="reorderable">1</property>
+                                        <child>
+                                          <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
+                                          <attributes>
+                                            <attribute name="icon_name">1</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                                        <property name="title" translatable="yes">Name</property>
+                                        <property name="resizable">1</property>
+                                        <property name="reorderable">1</property>
+                                        <property name="sort-indicator">1</property>
+                                        <property name="sort-column-id">2</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext3">
+                                            <property name="ellipsize">end</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                                        <property name="title" translatable="yes">Nick</property>
+                                        <property name="resizable">1</property>
+                                        <property name="reorderable">1</property>
+                                        <property name="sort-indicator">1</property>
+                                        <property name="sort-column-id">3</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext4">
+                                            <property name="ellipsize">end</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute name="text">3</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                                <property name="can-focus">1</property>
+                                <property name="shadow-type">in</property>
+                                <property name="vexpand">1</property>
+                                <child>
+                                  <object class="GtkTextView" id="textview1">
+                                    <property name="can-focus">1</property>
+                                    <property name="buffer">textbuffer1</property>
+                                    <property name="wrap-mode">2</property>
+                                    <property name="left-margin">10</property>
+                                    <property name="right-margin">10</property>
+                                    <property name="populate-all">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator" id="separator5"/>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box5">
+                        <property name="spacing">10</property>
+                        <property name="homogeneous">1</property>
+                        <child>
+                          <object class="GtkNotebook" id="notebook1">
+                            <property name="can-focus">1</property>
+                            <child>
+                              <object class="GtkBox" id="box6">
+                                <property name="orientation">vertical</property>
+                              </object>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label5">
+                                <property name="label" translatable="yes">page 1</property>
+                              </object>
+                              <packing>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box7">
+                                <property name="orientation">vertical</property>
+                              </object>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label6">
+                                <property name="label" translatable="yes">page 2</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box8">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label7">
+                                <property name="label" translatable="yes">page 3</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkNotebook" id="notebook2">
+                            <property name="can-focus">1</property>
+                            <property name="tab-pos">right</property>
+                            <child>
+                              <object class="GtkBox" id="box9">
+                                <property name="orientation">vertical</property>
+                              </object>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label8">
+                                <property name="label" translatable="yes">page 1</property>
+                              </object>
+                              <packing>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box10">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label9">
+                                <property name="label" translatable="yes">page 2</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box11">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label10">
+                                <property name="label" translatable="yes">page 3</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkNotebook" id="notebook3">
+                            <property name="can-focus">1</property>
+                            <property name="tab-pos">bottom</property>
+                            <child>
+                              <object class="GtkBox" id="box12">
+                                <property name="orientation">vertical</property>
+                              </object>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label11">
+                                <property name="label" translatable="yes">page 1</property>
+                              </object>
+                              <packing>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box13">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label12">
+                                <property name="label" translatable="yes">page 2</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box14">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label13">
+                                <property name="label" translatable="yes">page 3</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkNotebook" id="notebook4">
+                            <property name="can-focus">1</property>
+                            <property name="tab-pos">left</property>
+                            <child>
+                              <object class="GtkBox" id="box15">
+                                <property name="orientation">vertical</property>
+                              </object>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label14">
+                                <property name="label" translatable="yes">page 1</property>
+                              </object>
+                              <packing>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box16">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label15">
+                                <property name="label" translatable="yes">page 2</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box17">
+                                <property name="orientation">vertical</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label16">
+                                <property name="label" translatable="yes">page 3</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                                <property name="tab-fill">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">page2</property>
+                <property name="title" translatable="yes">Page 2</property>
+                <property name="child">
+                  <object class="GtkOverlay" id="page2">
+                    <child type="overlay">
+                      <object class="GtkRevealer" id="page2revealer">
+                        <property name="halign">center</property>
+                        <property name="valign">start</property>
+                        <child>
+                          <object class="GtkFrame" id="page2frame">
+                            <style>
+                              <class name="app-notification"/>
+                            </style>
+                            <child>
+                              <object class="GtkBox" id="page2box">
+                                <property name="spacing">20</property>
+                                <property name="margin">10</property>
+                                <child>
+                                  <object class="GtkLabel" id="page2note">
+                                    <property name="hexpand">1</property>
+                                    <property name="halign">start</property>
+                                    <property name="label">NEWS!</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="page2reset">
+                                    <property name="valign">center</property>
+                                    <property name="label" translatable="yes">Reset</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="page2dismiss">
+                                    <property name="focus-on-click">0</property>
+                                    <property name="relief">none</property>
+                                    <property name="icon-name">window-close-symbolic</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="spacing">10</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkSpinButton" id="verticalspin1">
+                                    <property name="orientation">vertical</property>
+                                    <property name="adjustment">adjustment2</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="verticalspin2">
+                                    <property name="sensitive">0</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="adjustment">adjustment2</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid">
+                                    <property name="row-spacing">6</property>
+                                    <property name="column-spacing">6</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <child>
+                                      <object class="GtkVolumeButton">
+                                        <property name="orientation">vertical</property>
+                                        <property name="valign">center</property>
+                                        <property name="value">.5</property>
+                                        <property name="halign">center</property>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScaleButton" id="mic-button">
+                                        <property name="has-tooltip">1</property>
+                                        <property name="icons">microphone-sensitivity-muted-symbolic
+microphone-sensitivity-high-symbolic
+microphone-sensitivity-low-symbolic
+microphone-sensitivity-medium-symbolic</property>
+                                        <property name="valign">center</property>
+                                        <property name="value">.5</property>
+                                        <property name="halign">center</property>
+                                        <signal name="query-tooltip" handler="on_scale_button_query_tooltip" swapped="no"/>
+                                        <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparator"/>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="page2frame1">
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkStack" id="stack">
+                                        <property name="transition-type">crossfade</property>
+                                        <property name="transition-duration">1000</property>
+                                        <child>
+                                          <object class="GtkStackPage">
+                                            <property name="name">page1</property>
+                                            <property name="icon-name">preferences-desktop-locale-symbolic</property>
+                                            <property name="title">News</property>
+                                            <property name="child">
+                                              <object class="GtkScrolledWindow" id="swo">
+                                                <property name="hscrollbar-policy">never</property>
+                                                <child>
+                                                  <object class="GtkTextView" id="tvo">
+                                                    <property name="can-focus">1</property>
+                                                    <property name="buffer">textbuffer2</property>
+                                                    <property name="left-margin">10</property>
+                                                    <property name="right-margin">10</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkStackPage">
+                                            <property name="name">page2</property>
+                                            <property name="icon-name">folder-pictures-symbolic</property>
+                                            <property name="title">Logo</property>
+                                            <property name="child">
+                                              <object class="GtkImage" id="imageo">
+                                                <property name="icon-name">gtk3-widget-factory</property>
+                                                <property name="pixel-size">256</property>
+                                              </object>
+                                            </property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkActionBar" id="actionbar1">
+                                        <child type="center">
+                                          <object class="GtkStackSwitcher" id="switcher">
+                                            <property name="stack">stack</property>
+                                            <property name="halign">center</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <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>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparator"/>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow">
+                                <property name="shadow-type">in</property>
+                                <property name="hscrollbar-policy">never</property>
+                                <property name="min-content-height">200</property>
+                                <child>
+                                  <object class="GtkListBox" id="listbox">
+                                    <property name="selection-mode">none</property>
+                                    <child type="placeholder">
+                                      <object class="GtkLabel">
+                                        <property name="label">No rows found</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkListBoxRow" id="listboxrow1">
+                                        <property name="activatable">0</property>
+                                        <property name="selectable">0</property>
+                                        <child>
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Row 1</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin">6</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSwitch" id="listboxrow1switch">
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkListBoxRow" id="listboxrow2">
+                                        <property name="activatable">0</property>
+                                        <child>
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Row 2</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin">6</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkScale">
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="draw-value">0</property>
+                                                <property name="width-request">150</property>
+                                                <property name="adjustment">adjustment1</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkListBoxRow" id="listboxrow3">
+                                        <child>
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Row 3</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin">6</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImage" id="listboxrow3image">
+                                                <property name="icon-name">object-select-symbolic</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="opacity">0</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkListBoxRow" id="listboxrow4">
+                                        <child>
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Row 4</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin">6</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkImage">
+                                                <property name="icon-name">object-select-symbolic</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="opacity">0</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkListBoxRow" id="listboxrow5">
+                                        <property name="activatable">0</property>
+                                        <child>
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Row 5</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin">6</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton" id="listboxrow5button">
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="icon-name">appointment-soon-symbolic</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkListBoxRow" id="listboxrow6">
+                                        <property name="activatable">0</property>
+                                        <child>
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Row 6</property>
+                                                <property name="halign">start</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin">6</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkCheckButton">
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="orientation">vertical</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkFrame" id="page2frame2">
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkMenuBar">
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem1">
+                                            <property name="label" translatable="yes">_File</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu1">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem101">
+                                                    <property name="label" translatable="yes">_New</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem102">
+                                                    <property name="label" translatable="yes">_Open</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem103">
+                                                    <property name="label" translatable="yes">_Save</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem104">
+                                                    <property name="label" translatable="yes">Save _As</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkSeparatorMenuItem" id="separatormenuitem1"/>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="quitmenuitem">
+                                                    <property name="label" translatable="yes">_Quit</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">app.quit</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem2">
+                                            <property name="label" translatable="yes">_Edit</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu2">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem106">
+                                                    <property name="label" translatable="yes">Cu_t</property>
+                                                    <property name="can-focus">1</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem107">
+                                                    <property name="label" translatable="yes">_Copy</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem108">
+                                                    <property name="label" translatable="yes">_Paste</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="deletemenuitem">
+                                                    <property name="label" translatable="yes">_Delete</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.delete</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="searchmenuitem">
+                                                    <property name="label" translatable="yes">_Search</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.search</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="togglesmenuitem">
+                                                    <property name="label">Checks &amp; Radios</property>
+                                                    <property name="use-underline">1</property>
+                                                    <child type="submenu">
+                                                      <object class="GtkMenu" id="togglessubmenu">
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem1">
+                                                            <property name="label">_Check</property>
+                                                            <property name="active">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem2">
+                                                            <property name="label">_Check</property>
+                                                            <property name="active">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem3">
+                                                            <property name="label">_Check</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem4">
+                                                            <property name="label">_Check</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem5">
+                                                            <property name="label">_Check</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem6">
+                                                            <property name="label">_Check</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkSeparatorMenuItem" id="separatormenuitem"/>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem1">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="active">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem2">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="active">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem3">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem4">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem5">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem6">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem3">
+                                            <property name="label" translatable="yes">_View</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="view-menu">
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="darkmenuitem">
+                                                    <property name="label">_Dark theme</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.dark</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="toolbarmenuitem">
+                                                    <property name="label">_Toolbar</property>
+                                                    <property name="active">1</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.toolbar</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="statusbarmenuitem">
+                                                    <property name="label">_Statusbar</property>
+                                                    <property name="active">1</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.statusbar</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="bgmenuitem">
+                                                    <property name="label">_Select Background</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.background</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem4">
+                                            <property name="label" translatable="yes">_Help</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu3">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="aboutmenuitem">
+                                                    <property name="label" translatable="yes">_About</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">app.about</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolbar" id="toolbar">
+                                        <child>
+                                          <object class="GtkToolButton">
+                                            <property name="label" translatable="yes">New</property>
+                                            <property name="icon-name">document-new</property>
+                                            <property name="tooltip-text" translatable="yes">Create a new document</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkToolButton">
+                                            <property name="label" translatable="yes">Save</property>
+                                            <property name="icon-name">document-save</property>
+                                            <property name="tooltip-text" translatable="yes">Save the current document</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSeparatorToolItem"/>
+                                        </child>
+                                        <child>
+                                          <object class="GtkToolButton">
+                                            <property name="label" translatable="yes">Search</property>
+                                            <property name="icon-name">edit-find</property>
+                                            <property name="action-name">win.search</property>
+                                            <property name="tooltip-text" translatable="yes">Search for it</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkToolButton">
+                                            <property name="sensitive">0</property>
+                                            <property name="label" translatable="yes">Insert</property>
+                                            <property name="icon-name">insert-image</property>
+                                            <property name="tooltip-text" translatable="yes">Insert something</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSearchBar" id="searchbar">
+                                        <child>
+                                          <object class="GtkSearchEntry"/>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkInfoBar" id="infobar">
+                                        <property name="visible">0</property>
+                                        <property name="show-close-button">1</property>
+                                        <child internal-child="content_area">
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label">You wanted to delete something.</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScrolledWindow">
+                                        <property name="shadow-type">in</property>
+                                        <property name="vexpand">1</property>
+                                        <child>
+                                          <object class="MyTextView" id="text3">
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="buffer">textbuffer1</property>
+                                            <property name="wrap-mode">2</property>
+                                            <property name="left-margin">10</property>
+                                            <property name="right-margin">10</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStatusbar" id="statusbar"/>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparator"/>
+                            </child>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="spacing">10</property>
+                                    <property name="expand">1</property>
+                                    <child>
+                                      <object class="GtkFrame" id="panedframe1">
+                                        <property name="expand">1</property>
+                                        <child>
+                                          <object class="GtkPaned">
+                                            <style>
+                                              <class name="view"/>
+                                            </style>
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label">Left</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label">Right</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkFrame" id="panedframe2">
+                                        <property name="expand">1</property>
+                                        <child>
+                                          <object class="GtkPaned">
+                                            <property name="orientation">vertical</property>
+                                            <style>
+                                              <class name="view"/>
+                                            </style>
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label">Top</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label">Bottom</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="orientation">vertical</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="filler2">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkCalendar">
+                                <property name="halign">center</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSeparator"/>
+                            </child>
+                            <child>
+                              <object class="GtkExpander" id="expander1">
+                                <property name="can-focus">1</property>
+                                <property name="expanded">1</property>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkScrolledWindow" id="scrolledwindow3">
+                                        <property name="can-focus">1</property>
+                                        <property name="shadow-type">in</property>
+                                        <property name="margin-top">6</property>
+                                        <property name="height-request">226</property>
+                                        <child>
+                                          <object class="GtkIconView" id="iconview1">
+                                            <property name="can-focus">1</property>
+                                            <property name="selection-mode">multiple</property>
+                                            <property name="model">iconsmodel</property>
+                                            <child>
+                                              <object class="GtkCellRendererPixbuf" id="iconviewcell"/>
+                                              <attributes>
+                                                <attribute name="icon-name">0</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolbar">
+                                        <property name="toolbar-style">icons</property>
+                                        <style>
+                                          <class name="inline-toolbar"/>
+                                        </style>
+                                        <child>
+                                          <object class="GtkToolButton" id="decrease_button">
+                                            <property name="icon-name">zoom-out-symbolic</property>
+                                            <property name="tooltip-text">Normal icons</property>
+                                            <signal name="clicked" handler="decrease_icon_size" object="iconview1" swapped="yes"/>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkToolButton" id="increase_button">
+                                            <property name="icon-name">zoom-in-symbolic</property>
+                                            <property name="tooltip-text">Large icons</property>
+                                            <signal name="clicked" handler="increase_icon_size" object="iconview1" swapped="yes"/>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkToolButton" id="reset_button">
+                                            <property name="icon-name">zoom-original-symbolic</property>
+                                            <property name="tooltip-text">Inherited icon size</property>
+                                            <signal name="clicked" handler="reset_icon_size" object="iconview1" swapped="yes"/>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label19">
+                                    <property name="label" translatable="yes">Expander</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="info_dialog_button">
+                                <property name="label" translatable="yes">_Inform</property>
+                                <property name="use-underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="action_dialog_button">
+                                <property name="label" translatable="yes">_Act</property>
+                                <property name="use-underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="preference_dialog_button">
+                                <property name="label" translatable="yes">_Configure</property>
+                                <property name="use-underline">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="selection_dialog_button">
+                                <property name="label" translatable="yes">_Select</property>
+                                <property name="use-underline">1</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">page3</property>
+                <property name="title" translatable="yes">Page 3</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="spacing">10</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">10</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">4</property>
+                            <child>
+                              <object class="GtkScrolledWindow">
+                                <property name="hscrollbar-policy">never</property>
+                                <property name="vscrollbar-policy">always</property>
+                                <property name="height-request">300</property>
+                                <property name="shadow-type">in</property>
+                                <child>
+                                  <object class="GtkTreeView" id="charletree">
+                                    <property name="enable-grid-lines">vertical</property>
+                                    <property name="enable-tree-lines">1</property>
+                                    <property name="rubber-banding">1</property>
+                                    <property name="model">charlemodel</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection">
+                                        <property name="mode">multiple</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn">
+                                        <property name="title" translatable="yes">Name</property>
+                                        <child>
+                                          <object class="GtkCellRendererText"/>
+                                          <attributes>
+                                            <attribute name="text">0</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn">
+                                        <property name="title" translatable="yes">Birth</property>
+                                        <child>
+                                          <object class="GtkCellRendererText"/>
+                                          <attributes>
+                                            <attribute name="text">1</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn">
+                                        <property name="title" translatable="yes">Death</property>
+                                        <child>
+                                          <object class="GtkCellRendererText"/>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="selectable">1</property>
+                                <property name="halign">start</property>
+                                <property name="use-markup">1</property>
+                                <property name="label" translatable="yes">&lt;small&gt;Data source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Charlemagne#Ancestry&quot;&gt;Wikipedia&lt;/a&gt;&lt;/small&gt;</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator"/>
+                        </child>
+                        <child>
+                          <object class="GtkScrolledWindow">
+                            <property name="hscrollbar-policy">never</property>
+                            <property name="vexpand">1</property>
+                            <property name="shadow-type">in</property>
+                            <child>
+                              <object class="GtkListBox" id="munsell">
+                                <property name="selection-mode">multiple</property>
+                                <property name="activate-on-single-click">0</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="orientation">vertical</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">10</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="halign">start</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkBox" id="lockbox">
+                                <property name="halign">start</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkMenuButton" id="open_menubutton">
+                                    <property name="halign">center</property>
+                                    <property name="popover">open_popover</property>
+                                    <style>
+                                      <class name="text-button"/>
+                                      <class name="image-button"/>
+                                    </style>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel">
+                                            <property name="valign">baseline</property>
+                                            <property name="label">Open</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="valign">baseline</property>
+                                            <property name="icon-name">pan-down-symbolic</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkToggleButton" id="record_button">
+                                    <property name="halign">center</property>
+                                    <signal name="toggled" handler="on_record_button_toggled"/>
+                                    <style>
+                                      <class name="text-button"/>
+                                      <class name="image-button"/>
+                                      <class name="destructive-action"/>
+                                    </style>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="valign">baseline</property>
+                                            <property name="icon-name">media-record-symbolic</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel">
+                                            <property name="valign">baseline</property>
+                                            <property name="label">Record</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkBox">
+                                    <style>
+                                      <class name="linked"/>
+                                    </style>
+                                    <child>
+                                      <object class="GtkRadioButton" id="grid_button">
+                                        <property name="draw-indicator">0</property>
+                                        <property name="active">1</property>
+                                        <property name="icon-name">view-grid-symbolic</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" id="list_button">
+                                        <property name="active">1</property>
+                                        <property name="draw-indicator">0</property>
+                                        <property name="group">grid_button</property>
+                                        <property name="icon-name">view-list-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="circular_button">
+                                    <property name="icon-name">emblem-system-symbolic</property>
+                                    <style>
+                                      <class name="circular"/>
+                                    </style>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLockButton" id="lockbutton"/>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator"/>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkStackSidebar">
+                                    <property name="stack">sidebar_stack</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkStack" id="sidebar_stack">
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">id</property>
+                                        <property name="title">Identity</property>
+                                        <property name="child">
+                                          <object class="GtkBox">
+                                            <property name="orientation">vertical</property>
+                                            <property name="margin">20</property>
+                                            <property name="spacing">10</property>
+                                            <property name="halign">center</property>
+                                            <property name="valign">center</property>
+                                            <child>
+                                              <object class="GtkEntry">
+                                                <property name="placeholder-text">First Name</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEntry">
+                                                <property name="placeholder-text">Last Name</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">bd</property>
+                                        <property name="title">Birthdate</property>
+                                        <property name="child">
+                                          <object class="GtkBox">
+                                            <property name="orientation">vertical</property>
+                                            <property name="margin">20</property>
+                                            <property name="spacing">10</property>
+                                            <property name="halign">center</property>
+                                            <property name="valign">center</property>
+                                            <child>
+                                              <object class="GtkBox">
+                                                <property name="spacing">2</property>
+                                                <child>
+                                                  <object class="GtkComboBoxText">
+                                                    <property name="active">9</property>
+                                                    <items>
+                                                      <item>1</item>
+                                                      <item>2</item>
+                                                      <item>3</item>
+                                                      <item>4</item>
+                                                      <item>5</item>
+                                                      <item>6</item>
+                                                      <item>7</item>
+                                                      <item>8</item>
+                                                      <item>9</item>
+                                                      <item>10</item>
+                                                      <item>11</item>
+                                                      <item>12</item>
+                                                      <item>13</item>
+                                                      <item>14</item>
+                                                      <item>15</item>
+                                                      <item>16</item>
+                                                      <item>17</item>
+                                                      <item>18</item>
+                                                      <item>19</item>
+                                                      <item>20</item>
+                                                      <item>21</item>
+                                                      <item>22</item>
+                                                      <item>23</item>
+                                                      <item>24</item>
+                                                      <item>25</item>
+                                                      <item>26</item>
+                                                      <item>27</item>
+                                                      <item>28</item>
+                                                      <item>29</item>
+                                                      <item>30</item>
+                                                      <item>31</item>
+                                                    </items>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBoxText">
+                                                    <property name="active">9</property>
+                                                    <items>
+                                                      <item>January</item>
+                                                      <item>February</item>
+                                                      <item>March</item>
+                                                      <item>April</item>
+                                                      <item>May</item>
+                                                      <item>June</item>
+                                                      <item>July</item>
+                                                      <item>August</item>
+                                                      <item>September</item>
+                                                      <item>October</item>
+                                                      <item>November</item>
+                                                      <item>December</item>
+                                                    </items>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEntry">
+                                                <property name="placeholder-text">Year</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">ad</property>
+                                        <property name="title">Address</property>
+                                        <property name="child">
+                                          <object class="GtkBox">
+                                            <property name="orientation">vertical</property>
+                                            <property name="margin">20</property>
+                                            <property name="halign">center</property>
+                                            <property name="valign">center</property>
+                                            <style>
+                                              <class name="linked"/>
+                                            </style>
+                                            <child>
+                                              <object class="GtkEntry">
+                                                <property name="placeholder-text">Street</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEntry">
+                                                <property name="placeholder-text">City</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEntry">
+                                                <property name="placeholder-text">Province</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">pg</property>
+                                        <property name="title">Pages</property>
+                                        <property name="child">
+                                          <object class="GtkBox">
+                                            <property name="orientation">vertical</property>
+                                            <property name="margin">20</property>
+                                            <property name="halign">center</property>
+                                            <property name="valign">center</property>
+                                            <style>
+                                              <class name="linked"/>
+                                            </style>
+                                            <child>
+                                              <object class="GtkComboBoxText" id="page_combo">
+                                                <property name="active">0</property>
+                                                <signal name="changed" handler="on_page_combo_changed"/>
+                                                <items>
+                                                  <item>Range</item>
+                                                  <item>All</item>
+                                                  <item>Current</item>
+                                                  <item>-</item>
+                                                  <item>None</item>
+                                                </items>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSpinButton" id="range_from_spin">
+                                                <property name="adjustment">pg_adjustment</property>
+                                                <signal name="value-changed" handler="on_range_from_changed"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSpinButton" id="range_to_spin">
+                                                <property name="adjustment">pg_adjustment2</property>
+                                                <signal name="value-changed" handler="on_range_to_changed"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton" id="print_button">
+                                                <property name="label">Print</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkToolbar">
+                                    <property name="orientation">vertical</property>
+                                    <property name="toolbar-style">icons</property>
+                                    <child>
+                                      <object class="GtkToolButton" id="toolbutton1">
+                                        <property name="icon-name">document-open-symbolic</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="toolbutton2">
+                                        <property name="icon-name">send-to-symbolic</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="toolbutton3">
+                                        <property name="icon-name">view-fullscreen-symbolic</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkToolButton" id="toolbutton4">
+                                        <property name="icon-name">star-new-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow">
+                                    <property name="hexpand">1</property>
+                                    <child>
+                                      <object class="GtkTextView" id="tooltextview"/>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <property name="margin">6</property>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <style>
+                                          <class name="linked"/>
+                                        </style>
+                                        <child>
+                                          <object class="GtkButton" id="cutbutton">
+                                            <property name="sensitive">0</property>
+                                            <property name="icon-name">edit-cut-symbolic</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="copybutton">
+                                            <property name="sensitive">0</property>
+                                            <property name="icon-name">edit-copy-symbolic</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="pastebutton">
+                                            <property name="sensitive">0</property>
+                                            <property name="icon-name">edit-paste-symbolic</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="deletebutton">
+                                        <property name="sensitive">0</property>
+                                        <property name="valign">end</property>
+                                        <property name="icon-name">edit-delete-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkOverlay">
+                            <child type="overlay">
+                              <object class="GtkToolbar" id="totem_like_osd">
+                                <property name="visible">0</property>
+                                <property name="opacity">0.9</property>
+                                <property name="margin">20</property>
+                                <property name="valign">end</property>
+                                <style>
+                                  <class name="osd"/>
+                                </style>
+                                <child>
+                                  <object class="GtkToolItem">
+                                    <child>
+                                      <object class="GtkBox">
+                                        <style>
+                                          <class name="linked"/>
+                                        </style>
+                                        <child>
+                                          <object class="GtkButton">
+                                            <property name="icon-name">pan-start-symbolic</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton">
+                                            <property name="icon-name">pan-end-symbolic</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkToolItem">
+                                    <child>
+                                      <object class="GtkScale">
+                                        <property name="draw-value">0</property>
+                                        <property name="adjustment">adjustment1</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkToolItem">
+                                    <child>
+                                      <object class="GtkVolumeButton">
+                                        <property name="orientation">vertical</property>
+                                        <property name="value">.5</property>
+                                        <style>
+                                          <class name="image-button"/>
+                                        </style>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="osd_frame">
+                                <child>
+                                  <object class="GtkPaned">
+                                    <property name="wide-handle">1</property>
+                                    <child>
+                                      <object class="GtkNotebook">
+                                        <property name="show-border">0</property>
+                                        <child>
+                                          <object class="GtkBox" id="closable_page_1">
+                                            <property name="height-request">120</property>
+                                          </object>
+                                          <packing>
+                                            <property name="tab-expand">1</property>
+                                          </packing>
+                                        </child>
+                                        <child type="tab">
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Page 1</property>
+                                                <property name="halign">center</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton">
+                                                <property name="relief">none</property>
+                                                <property name="focus-on-click">0</property>
+                                                <property name="icon-name">window-close-symbolic</property>
+                                                <signal name="clicked" handler="tab_close_cb" object="closable_page_1"/>
+                                                <style>
+                                                  <class name="small-button"/>
+                                                </style>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkBox" id="closable_page_2">
+                                            <property name="vexpand">1</property>
+                                          </object>
+                                          <packing>
+                                            <property name="tab-expand">1</property>
+                                          </packing>
+                                        </child>
+                                        <child type="tab">
+                                          <object class="GtkBox">
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="label" translatable="yes">Page 2</property>
+                                                <property name="halign">center</property>
+                                                <property name="hexpand">1</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton">
+                                                <property name="relief">none</property>
+                                                <property name="focus-on-click">0</property>
+                                                <property name="icon-name">window-close-symbolic</property>
+                                                <signal name="clicked" handler="tab_close_cb" object="closable_page_2"/>
+                                                <style>
+                                                  <class name="small-button"/>
+                                                </style>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkNotebook">
+                                        <property name="show-border">0</property>
+                                        <child>
+                                          <object class="GtkBox">
+                                            <property name="vexpand">1</property>
+                                          </object>
+                                        </child>
+                                        <child type="tab">
+                                          <object class="GtkLabel">
+                                            <property name="label" translatable="yes">Page 3</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGestureMultiPress">
+                                    <signal name="pressed" handler="osd_frame_pressed" object="osd_frame" swapped="no"/>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="orientation">vertical</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">10</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="halign">center</property>
+                            <child>
+                              <object class="GtkEntry">
+                                <property name="can-focus">1</property>
+                                <property name="placeholder-text" translatable="yes">Name…</property>
+                                <property name="completion">name_completion</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkEntry">
+                                <property name="can-focus">1</property>
+                                <property name="show-emoji-icon">1</property>
+                                <property name="placeholder-text" translatable="yes">Age…</property>
+                              </object>
+                            </child>
+                            <style>
+                              <class name="linked"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator"/>
+                        </child>
+                        <child>
+                          <object class="GtkNotebook">
+                            <property name="scrollable">1</property>
+                            <child type="action-end">
+                              <object class="GtkMenuButton">
+                                <property name="valign">center</property>
+                                <property name="popover">notebook_info_popover</property>
+                                <property name="icon-name">emblem-important-symbolic</property>
+                                <property name="relief">none</property>
                                 <style>
                                   <class name="circular"/>
                                 </style>
                               </object>
                             </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLockButton" id="lockbutton"/>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator"/>
-                    </child>
-                    <child>
-                      <object class="GtkFrame">
-                        <child>
-                          <object class="GtkBox">
                             <child>
-                              <object class="GtkStackSidebar">
-                                <property name="stack">sidebar_stack</property>
+                              <object class="GtkBox">
+                                <property name="height-request">120</property>
                               </object>
+                              <packing>
+                                <property name="tab-expand">1</property>
+                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkStack" id="sidebar_stack">
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <property name="margin">20</property>
-                                    <property name="spacing">10</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
-                                    <child>
-                                      <object class="GtkEntry">
-                                        <property name="placeholder-text">First Name</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry">
-                                        <property name="placeholder-text">Last Name</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="name">id</property>
-                                    <property name="title">Identity</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <property name="margin">20</property>
-                                    <property name="spacing">10</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="spacing">2</property>
-                                        <child>
-                                          <object class="GtkComboBoxText">
-                                            <property name="active">9</property>
-                                            <items>
-                                              <item>1</item>
-                                              <item>2</item>
-                                              <item>3</item>
-                                              <item>4</item>
-                                              <item>5</item>
-                                              <item>6</item>
-                                              <item>7</item>
-                                              <item>8</item>
-                                              <item>9</item>
-                                              <item>10</item>
-                                              <item>11</item>
-                                              <item>12</item>
-                                              <item>13</item>
-                                              <item>14</item>
-                                              <item>15</item>
-                                              <item>16</item>
-                                              <item>17</item>
-                                              <item>18</item>
-                                              <item>19</item>
-                                              <item>20</item>
-                                              <item>21</item>
-                                              <item>22</item>
-                                              <item>23</item>
-                                              <item>24</item>
-                                              <item>25</item>
-                                              <item>26</item>
-                                              <item>27</item>
-                                              <item>28</item>
-                                              <item>29</item>
-                                              <item>30</item>
-                                              <item>31</item>
-                                            </items>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBoxText">
-                                            <property name="active">9</property>
-                                            <items>
-                                              <item>January</item>
-                                              <item>February</item>
-                                              <item>March</item>
-                                              <item>April</item>
-                                              <item>May</item>
-                                              <item>June</item>
-                                              <item>July</item>
-                                              <item>August</item>
-                                              <item>September</item>
-                                              <item>October</item>
-                                              <item>November</item>
-                                              <item>December</item>
-                                            </items>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry">
-                                        <property name="placeholder-text">Year</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="name">bd</property>
-                                    <property name="title">Birthdate</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <property name="margin">20</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
-                                    <style>
-                                      <class name="linked"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkEntry">
-                                        <property name="placeholder-text">Street</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry">
-                                        <property name="placeholder-text">City</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry">
-                                        <property name="placeholder-text">Province</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="name">ad</property>
-                                    <property name="title">Address</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <property name="margin">20</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
-                                    <style>
-                                      <class name="linked"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkComboBoxText" id="page_combo">
-                                        <property name="active">0</property>
-                                        <signal name="changed" handler="on_page_combo_changed"/>
-                                        <items>
-                                          <item>Range</item>
-                                          <item>All</item>
-                                          <item>Current</item>
-                                          <item>-</item>
-                                          <item>None</item>
-                                        </items>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" id="range_from_spin">
-                                        <property name="adjustment">pg_adjustment</property>
-                                        <signal name="value-changed" handler="on_range_from_changed"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" id="range_to_spin">
-                                        <property name="adjustment">pg_adjustment2</property>
-                                        <signal name="value-changed" handler="on_range_to_changed"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="print_button">
-                                        <property name="label">Print</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="name">pg</property>
-                                    <property name="title">Pages</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkFrame">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkToolbar">
-                                <property name="orientation">vertical</property>
-                                <property name="toolbar-style">icons</property>
-                                <child>
-                                  <object class="GtkToolButton" id="toolbutton1">
-                                    <property name="icon-name">document-open-symbolic</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="toolbutton2">
-                                    <property name="icon-name">send-to-symbolic</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="toolbutton3">
-                                    <property name="icon-name">view-fullscreen-symbolic</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="toolbutton4">
-                                    <property name="icon-name">star-new-symbolic</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkScrolledWindow">
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkTextView" id="tooltextview"/>
-                                </child>
+                            <child type="tab">
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Page 1</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="margin">6</property>
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="orientation">vertical</property>
-                                    <style>
-                                      <class name="linked"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkButton" id="cutbutton">
-                                        <property name="sensitive">0</property>
-                                        <property name="icon-name">edit-cut-symbolic</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="copybutton">
-                                        <property name="sensitive">0</property>
-                                        <property name="icon-name">edit-copy-symbolic</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="pastebutton">
-                                        <property name="sensitive">0</property>
-                                        <property name="icon-name">edit-paste-symbolic</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="deletebutton">
-                                    <property name="sensitive">0</property>
-                                    <property name="valign">end</property>
-                                    <property name="icon-name">edit-delete-symbolic</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkOverlay">
-                        <child type="overlay">
-                          <object class="GtkToolbar" id="totem_like_osd">
-                            <property name="visible">0</property>
-                            <property name="opacity">0.9</property>
-                            <property name="margin">20</property>
-                            <property name="valign">end</property>
-                            <style>
-                              <class name="osd"/>
-                            </style>
-                            <child>
-                              <object class="GtkToolItem">
-                                <child>
-                                  <object class="GtkBox">
-                                    <style>
-                                      <class name="linked"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkButton">
-                                        <property name="icon-name">pan-start-symbolic</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton">
-                                        <property name="icon-name">pan-end-symbolic</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkToolItem">
-                                <child>
-                                  <object class="GtkScale">
-                                    <property name="draw-value">0</property>
-                                    <property name="adjustment">adjustment1</property>
-                                  </object>
-                                </child>
+                                <property name="height-request">40</property>
                               </object>
                               <packing>
-                                <property name="expand">1</property>
+                                <property name="tab-expand">1</property>
                               </packing>
                             </child>
+                            <child type="tab">
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Page 2</property>
+                              </object>
+                            </child>
                             <child>
-                              <object class="GtkToolItem">
-                                <child>
-                                  <object class="GtkVolumeButton">
-                                    <property name="orientation">vertical</property>
-                                    <property name="value">.5</property>
-                                    <style>
-                                      <class name="image-button"/>
-                                    </style>
-                                  </object>
-                                </child>
+                              <object class="GtkBox"/>
+                              <packing>
+                                <property name="tab-expand">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Page 3</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox"/>
+                              <packing>
+                                <property name="tab-expand">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Page 4</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox"/>
+                              <packing>
+                                <property name="tab-expand">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Page 5</property>
                               </object>
                             </child>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="osd_frame">
-                            <child>
-                              <object class="GtkPaned">
-                                <property name="wide-handle">1</property>
-                                <child>
-                                  <object class="GtkNotebook">
-                                    <property name="show-border">0</property>
-                                    <child>
-                                      <object class="GtkBox" id="closable_page_1">
-                                        <property name="height-request">120</property>
-                                      </object>
-                                      <packing>
-                                        <property name="tab-expand">1</property>
-                                      </packing>
-                                    </child>
-                                    <child type="tab">
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Page 1</property>
-                                            <property name="halign">center</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton">
-                                            <property name="relief">none</property>
-                                            <property name="focus-on-click">0</property>
-                                            <property name="icon-name">window-close-symbolic</property>
-                                            <signal name="clicked" handler="tab_close_cb" object="closable_page_1"/>
-                                            <style>
-                                              <class name="small-button"/>
-                                            </style>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkBox" id="closable_page_2">
-                                        <property name="vexpand">1</property>
-                                      </object>
-                                      <packing>
-                                        <property name="tab-expand">1</property>
-                                      </packing>
-                                    </child>
-                                    <child type="tab">
-                                      <object class="GtkBox">
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label" translatable="yes">Page 2</property>
-                                            <property name="halign">center</property>
-                                            <property name="hexpand">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkButton">
-                                            <property name="relief">none</property>
-                                            <property name="focus-on-click">0</property>
-                                            <property name="icon-name">window-close-symbolic</property>
-                                            <signal name="clicked" handler="tab_close_cb" object="closable_page_2"/>
-                                            <style>
-                                              <class name="small-button"/>
-                                            </style>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkNotebook">
-                                    <property name="show-border">0</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="vexpand">1</property>
-                                      </object>
-                                    </child>
-                                    <child type="tab">
-                                      <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Page 3</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGestureMultiPress">
-                                <signal name="pressed" handler="osd_frame_pressed" object="osd_frame" swapped="no"/>
-                              </object>
-                            </child>
+                          <object class="GtkColorChooserWidget" id="cchooser">
+                            <property name="show-editor">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator">
-                    <property name="orientation">vertical</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">10</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="halign">center</property>
-                        <child>
-                          <object class="GtkEntry">
-                            <property name="can-focus">1</property>
-                            <property name="placeholder-text" translatable="yes">Name…</property>
-                            <property name="completion">name_completion</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry">
-                            <property name="can-focus">1</property>
-                            <property name="show-emoji-icon">1</property>
-                            <property name="placeholder-text" translatable="yes">Age…</property>
-                          </object>
-                        </child>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkNotebook">
-                        <property name="scrollable">1</property>
-                        <child type="action-end">
-                          <object class="GtkMenuButton">
-                            <property name="valign">center</property>
-                            <property name="popover">notebook_info_popover</property>
-                            <property name="icon-name">emblem-important-symbolic</property>
-                            <property name="relief">none</property>
-                            <style>
-                              <class name="circular"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="height-request">120</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Page 1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Page 2</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox"/>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Page 3</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox"/>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Page 4</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox"/>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Page 5</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkColorChooserWidget" id="cchooser">
-                        <property name="show-editor">1</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">page3</property>
-                <property name="title" translatable="yes">Page 3</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/docs/reference/gtk/gtk4-builder-tool.xml b/docs/reference/gtk/gtk4-builder-tool.xml
index e9f497599e..992f2d9db1 100644
--- a/docs/reference/gtk/gtk4-builder-tool.xml
+++ b/docs/reference/gtk/gtk4-builder-tool.xml
@@ -79,6 +79,10 @@
     <term><option>--replace</option></term>
       <listitem><para>Write the content back to the .ui file instead of stdout.</para></listitem>
     </varlistentry>
+    <varlistentry>
+    <term><option>--3to4</option></term>
+      <listitem><para>Transform a GTK 3 ui file to GTK 4</para></listitem>
+    </varlistentry>
   </variablelist>
 </refsect1>
 
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 0e72ba604c..27c18bb3e9 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -211,8 +211,11 @@ gtk_adjustment_get_type
 <FILE>gtkassistant</FILE>
 <TITLE>GtkAssistant</TITLE>
 GtkAssistant
+GtkAssistantPage
 GtkAssistantClass
 gtk_assistant_new
+gtk_assistant_get_page
+gtk_assistant_page_get_child
 gtk_assistant_get_current_page
 gtk_assistant_set_current_page
 gtk_assistant_get_n_pages
@@ -6242,10 +6245,13 @@ gtk_header_bar_get_type
 <FILE>gtkstack</FILE>
 <TITLE>GtkStack</TITLE>
 GtkStack
+GtkStackPage
 gtk_stack_new
 gtk_stack_add_named
 gtk_stack_add_titled
 gtk_stack_get_child_by_name
+gtk_stack_get_page
+gtk_stack_page_get_child
 gtk_stack_set_visible_child
 gtk_stack_get_visible_child
 gtk_stack_set_visible_child_name
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index 26c78079cf..ecb383d45b 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -14,6 +14,7 @@ gtk_application_get_type
 gtk_application_window_get_type
 gtk_aspect_frame_get_type
 gtk_assistant_get_type
+gtk_assistant_page_get_type
 gtk_bin_get_type
 gtk_box_get_type
 gtk_builder_get_type
@@ -155,6 +156,7 @@ gtk_snapshot_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
+gtk_stack_page_get_type
 gtk_stack_sidebar_get_type
 gtk_stack_switcher_get_type
 gtk_statusbar_get_type
diff --git a/docs/reference/gtk/migrating-3to4.xml b/docs/reference/gtk/migrating-3to4.xml
index b599421d68..4fbafaa6a8 100644
--- a/docs/reference/gtk/migrating-3to4.xml
+++ b/docs/reference/gtk/migrating-3to4.xml
@@ -305,6 +305,21 @@
       </para>
     </section>
 
+    <section>
+      <title>Stop using GtkButtonBox</title>
+      <para>
+        GtkButtonBox has been removed. Use a GtkBox instead.
+      </para>
+    </section>
+
+    <section>
+      <title>Adapt to GtkButton API changes</title>
+      <para>
+        GtkBox no longer has pack-start and -end. Pack your widgets in the 
+        correct order, or reorder them as necessary.
+      </para>
+    </section>
+
     <section>
       <title>Adapt to GtkHeaderBar API changes</title>
       <para>
@@ -314,6 +329,17 @@
       </para>
     </section>
 
+    <section>
+      <title>Adapt to GtkStack API changes</title>
+      <para>
+        The GtkStack child properties have been converted into child meta object.
+        Instead of gtk_container_child_set (stack, child, …), you can now use
+        g_object_set (gtk_stack_get_page (stack, child), …). In .ui files, the
+        GtkStackPage objects must be created explicitly, and take the child widget
+        as property. gtk4-builder-tool can help with this conversion.
+      </para>
+    </section>
+
     <section>
       <title>Adapt to GtkStyleContext API changes</title>
       <para>
@@ -559,6 +585,14 @@
       </para>
     </section>
 
+    <section>
+      <title>Convert .ui files</title>
+      <para>
+        The simplify command of gtk4-builder-tool has gained a --3to4 option, which
+        can help with some of the required changes in .ui files, such as converting
+        child properties to child meta objects.
+      </para>
+    </section>
   </section>
 
 </chapter>
diff --git a/examples/application10/app-menu.ui b/examples/application10/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application10/app-menu.ui
+++ b/examples/application10/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application10/gears-menu.ui b/examples/application10/gears-menu.ui
index fb0e9299b8..0b3d15e1be 100644
--- a/examples/application10/gears-menu.ui
+++ b/examples/application10/gears-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="menu">
     <section>
       <item>
diff --git a/examples/application10/prefs.ui b/examples/application10/prefs.ui
index e4796b92bb..00e917763f 100644
--- a/examples/application10/prefs.ui
+++ b/examples/application10/prefs.ui
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <child>
@@ -25,8 +23,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font">
-              </object>
+              <object class="GtkFontButton" id="font"/>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
diff --git a/examples/application10/window.ui b/examples/application10/window.ui
index 14b2887cee..68ae81c904 100644
--- a/examples/application10/window.ui
+++ b/examples/application10/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
diff --git a/examples/application2/window.ui b/examples/application2/window.ui
index 03fe6d1e05..595df79ef0 100644
--- a/examples/application2/window.ui
+++ b/examples/application2/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
@@ -18,8 +16,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkStack" id="stack">
-          </object>
+          <object class="GtkStack" id="stack"/>
         </child>
       </object>
     </child>
diff --git a/examples/application3/window.ui b/examples/application3/window.ui
index 03fe6d1e05..595df79ef0 100644
--- a/examples/application3/window.ui
+++ b/examples/application3/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
@@ -18,8 +16,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkStack" id="stack">
-          </object>
+          <object class="GtkStack" id="stack"/>
         </child>
       </object>
     </child>
diff --git a/examples/application4/app-menu.ui b/examples/application4/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application4/app-menu.ui
+++ b/examples/application4/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application4/window.ui b/examples/application4/window.ui
index 03fe6d1e05..595df79ef0 100644
--- a/examples/application4/window.ui
+++ b/examples/application4/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
@@ -18,8 +16,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkStack" id="stack">
-          </object>
+          <object class="GtkStack" id="stack"/>
         </child>
       </object>
     </child>
diff --git a/examples/application5/app-menu.ui b/examples/application5/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application5/app-menu.ui
+++ b/examples/application5/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application5/window.ui b/examples/application5/window.ui
index 03fe6d1e05..595df79ef0 100644
--- a/examples/application5/window.ui
+++ b/examples/application5/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
@@ -18,8 +16,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkStack" id="stack">
-          </object>
+          <object class="GtkStack" id="stack"/>
         </child>
       </object>
     </child>
diff --git a/examples/application6/app-menu.ui b/examples/application6/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application6/app-menu.ui
+++ b/examples/application6/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application6/prefs.ui b/examples/application6/prefs.ui
index e4796b92bb..00e917763f 100644
--- a/examples/application6/prefs.ui
+++ b/examples/application6/prefs.ui
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <child>
@@ -25,8 +23,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font">
-              </object>
+              <object class="GtkFontButton" id="font"/>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
diff --git a/examples/application6/window.ui b/examples/application6/window.ui
index 03fe6d1e05..595df79ef0 100644
--- a/examples/application6/window.ui
+++ b/examples/application6/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
@@ -18,8 +16,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkStack" id="stack">
-          </object>
+          <object class="GtkStack" id="stack"/>
         </child>
       </object>
     </child>
diff --git a/examples/application7/app-menu.ui b/examples/application7/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application7/app-menu.ui
+++ b/examples/application7/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application7/prefs.ui b/examples/application7/prefs.ui
index e4796b92bb..00e917763f 100644
--- a/examples/application7/prefs.ui
+++ b/examples/application7/prefs.ui
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <child>
@@ -25,8 +23,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font">
-              </object>
+              <object class="GtkFontButton" id="font"/>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
diff --git a/examples/application7/window.ui b/examples/application7/window.ui
index 17592919c9..b748369f6a 100644
--- a/examples/application7/window.ui
+++ b/examples/application7/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
diff --git a/examples/application8/app-menu.ui b/examples/application8/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application8/app-menu.ui
+++ b/examples/application8/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application8/gears-menu.ui b/examples/application8/gears-menu.ui
index 7e5df31bf5..32cec0b28d 100644
--- a/examples/application8/gears-menu.ui
+++ b/examples/application8/gears-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="menu">
     <section>
       <item>
diff --git a/examples/application8/prefs.ui b/examples/application8/prefs.ui
index e4796b92bb..00e917763f 100644
--- a/examples/application8/prefs.ui
+++ b/examples/application8/prefs.ui
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <child>
@@ -25,8 +23,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font">
-              </object>
+              <object class="GtkFontButton" id="font"/>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
diff --git a/examples/application8/window.ui b/examples/application8/window.ui
index e19ec2eb34..278eafa8f5 100644
--- a/examples/application8/window.ui
+++ b/examples/application8/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
diff --git a/examples/application9/app-menu.ui b/examples/application9/app-menu.ui
index e1e131cfca..13bf8fd342 100644
--- a/examples/application9/app-menu.ui
+++ b/examples/application9/app-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="appmenu">
     <section>
       <item>
diff --git a/examples/application9/gears-menu.ui b/examples/application9/gears-menu.ui
index fb0e9299b8..0b3d15e1be 100644
--- a/examples/application9/gears-menu.ui
+++ b/examples/application9/gears-menu.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <menu id="menu">
     <section>
       <item>
diff --git a/examples/application9/prefs.ui b/examples/application9/prefs.ui
index e4796b92bb..00e917763f 100644
--- a/examples/application9/prefs.ui
+++ b/examples/application9/prefs.ui
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppPrefs" parent="GtkDialog">
     <property name="title" translatable="yes">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="resizable">0</property>
+    <property name="modal">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <child>
@@ -25,8 +23,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFontButton" id="font">
-              </object>
+              <object class="GtkFontButton" id="font"/>
               <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
diff --git a/examples/application9/window.ui b/examples/application9/window.ui
index 7226eaff19..2a173ea2ae 100644
--- a/examples/application9/window.ui
+++ b/examples/application9/window.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
   <template class="ExampleAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 81d632d909..50223bbc48 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -41,6 +41,10 @@
  * handling buttons, you can use the #GTK_ASSISTANT_PAGE_CUSTOM page
  * type and handle buttons yourself.
  *
+ * GtkAssistant maintains a #GtkAssistantPage object for each added
+ * child, which holds additional per-child properties. You
+ * obtain the #GtkAssistantPage for a child with gtk_assistant_get_page().
+ * 
  * # GtkAssistant as GtkBuildable
  *
  * The GtkAssistant implementation of the #GtkBuildable interface
@@ -48,8 +52,9 @@
  * “action_area”.
  *
  * To add pages to an assistant in #GtkBuilder, simply add it as a
- * child to the GtkAssistant object, and set its child properties
- * as necessary.
+ * child to the GtkAssistant object. If you need to set per-object
+ * properties, create a #GtkAssistantPage object explicitly, and
+ * set the child widget as a property on it.
  *
  * # CSS nodes
  *
@@ -79,10 +84,9 @@
 #include "a11y/gtkwindowaccessible.h"
 
 
-typedef struct _GtkAssistantPage GtkAssistantPage;
-
 struct _GtkAssistantPage
 {
+  GObject instance;
   GtkAssistantPageType type;
   guint      complete     : 1;
   guint      complete_set : 1;
@@ -96,6 +100,11 @@ struct _GtkAssistantPage
   GtkWidget *current_title;
 };
 
+struct _GtkAssistantPageClass
+{
+  GObjectClass parent_class;
+};
+
 struct _GtkAssistantPrivate
 {
   GtkWidget *cancel;
@@ -137,18 +146,20 @@ static void     gtk_assistant_add                (GtkContainer      *container,
                                                   GtkWidget         *page);
 static void     gtk_assistant_remove             (GtkContainer      *container,
                                                   GtkWidget         *page);
-static void     gtk_assistant_set_child_property (GtkContainer      *container,
-                                                  GtkWidget         *child,
+static void     gtk_assistant_page_set_property  (GObject           *object,
                                                   guint              property_id,
                                                   const GValue      *value,
                                                   GParamSpec        *pspec);
-static void     gtk_assistant_get_child_property (GtkContainer      *container,
-                                                  GtkWidget         *child,
+static void     gtk_assistant_page_get_property  (GObject           *object,
                                                   guint              property_id,
                                                   GValue            *value,
                                                   GParamSpec        *pspec);
 
 static void       gtk_assistant_buildable_interface_init     (GtkBuildableIface *iface);
+static void       gtk_assistant_buildable_add_child          (GtkBuildable  *buildable,
+                                                              GtkBuilder    *builder,          
+                                                              GObject       *child,
+                                                              const char    *type);
 static gboolean   gtk_assistant_buildable_custom_tag_start   (GtkBuildable  *buildable,
                                                               GtkBuilder    *builder,
                                                               GObject       *child,
@@ -180,17 +191,107 @@ static void       assistant_remove_page_cb                   (GtkContainer  *con
 							      GtkWidget     *page,
 							      GtkAssistant  *assistant);
 
+static int        gtk_assistant_add_page                     (GtkAssistant     *assistant,
+                                                              GtkAssistantPage *page_info,
+                                                              gint              position);
+
 GType             _gtk_assistant_accessible_get_type         (void);
 
 enum
 {
   CHILD_PROP_0,
+  CHILD_PROP_CHILD,
   CHILD_PROP_PAGE_TYPE,
   CHILD_PROP_PAGE_TITLE,
   CHILD_PROP_PAGE_COMPLETE,
   CHILD_PROP_HAS_PADDING
 };
 
+G_DEFINE_TYPE (GtkAssistantPage, gtk_assistant_page, G_TYPE_OBJECT)
+
+static void
+gtk_assistant_page_init (GtkAssistantPage *page)
+{
+  page->type = GTK_ASSISTANT_PAGE_CONTENT;
+}
+
+static void
+gtk_assistant_page_finalize (GObject *object)
+{
+  GtkAssistantPage *page = GTK_ASSISTANT_PAGE (object);
+
+  g_clear_object (&page->page);
+  g_free (page->title);
+
+  G_OBJECT_CLASS (gtk_assistant_page_parent_class)->finalize (object);
+}
+
+static void
+gtk_assistant_page_class_init (GtkAssistantPageClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = gtk_assistant_page_finalize;
+  object_class->get_property = gtk_assistant_page_get_property;
+  object_class->set_property = gtk_assistant_page_set_property;
+
+  /**
+   * GtkAssistantPage:page-type:
+   *
+   * The type of the assistant page.
+   */
+  g_object_class_install_property (object_class,
+                                   CHILD_PROP_PAGE_TYPE,
+                                   g_param_spec_enum ("page-type",
+                                                      P_("Page type"),
+                                                      P_("The type of the assistant page"),
+                                                      GTK_TYPE_ASSISTANT_PAGE_TYPE,
+                                                      GTK_ASSISTANT_PAGE_CONTENT,
+                                                      GTK_PARAM_READWRITE));
+
+  /**
+   * GtkAssistantPage:title:
+   *
+   * The title of the page.
+   */
+  g_object_class_install_property (object_class,
+                                   CHILD_PROP_PAGE_TITLE,
+                                   g_param_spec_string ("title",
+                                                        P_("Page title"),
+                                                        P_("The title of the assistant page"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkAssistantPage:complete:
+   *
+   * Setting the "complete" property to %TRUE marks a page as
+   * complete (i.e.: all the required fields are filled out). GTK+ uses
+   * this information to control the sensitivity of the navigation buttons.
+   */
+  g_object_class_install_property (object_class,
+                                   CHILD_PROP_PAGE_COMPLETE,
+                                   g_param_spec_boolean ("complete",
+                                                         P_("Page complete"),
+                                                         P_("Whether all required fields on the page have been filled out"),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+  g_object_class_install_property (object_class,
+                                   CHILD_PROP_HAS_PADDING,
+                                   g_param_spec_boolean ("has-padding",
+                                                         P_("Has padding"),
+                                                         P_("Whether the assistant adds padding around the page"),
+                                                         TRUE,
+                                                         G_PARAM_READWRITE));
+  g_object_class_install_property (object_class,
+                                   CHILD_PROP_CHILD,
+                                   g_param_spec_object ("child",
+                                                        P_("Child widget"),
+                                                        P_("The content the assistant page"),
+                                                        GTK_TYPE_WIDGET,
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
+
 enum
 {
   CANCEL,
@@ -395,8 +496,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
 
   container_class->add = gtk_assistant_add;
   container_class->remove = gtk_assistant_remove;
-  container_class->set_child_property = gtk_assistant_set_child_property;
-  container_class->get_child_property = gtk_assistant_get_child_property;
 
   window_class->close_request = gtk_assistant_close_request;
 
@@ -506,51 +605,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
                                                      -1, 1, -1,
                                                      GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
 
-  /**
-   * GtkAssistant:page-type:
-   *
-   * The type of the assistant page.
-   */
-  gtk_container_class_install_child_property (container_class,
-                                              CHILD_PROP_PAGE_TYPE,
-                                              g_param_spec_enum ("page-type",
-                                                                 P_("Page type"),
-                                                                 P_("The type of the assistant page"),
-                                                                 GTK_TYPE_ASSISTANT_PAGE_TYPE,
-                                                                 GTK_ASSISTANT_PAGE_CONTENT,
-                                                                 GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAssistant:title:
-   *
-   * The title of the page.
-   */
-  gtk_container_class_install_child_property (container_class,
-                                              CHILD_PROP_PAGE_TITLE,
-                                              g_param_spec_string ("title",
-                                                                   P_("Page title"),
-                                                                   P_("The title of the assistant page"),
-                                                                   NULL,
-                                                                   GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAssistant:complete:
-   *
-   * Setting the "complete" child property to %TRUE marks a page as
-   * complete (i.e.: all the required fields are filled out). GTK+ uses
-   * this information to control the sensitivity of the navigation buttons.
-   */
-  gtk_container_class_install_child_property (container_class,
-                                              CHILD_PROP_PAGE_COMPLETE,
-                                              g_param_spec_boolean ("complete",
-                                                                    P_("Page complete"),
-                                                                    P_("Whether all required fields on the page have been filled out"),
-                                                                    FALSE,
-                                                                    G_PARAM_READWRITE));
-
-  gtk_container_class_install_child_property (container_class, CHILD_PROP_HAS_PADDING,
-      g_param_spec_boolean ("has-padding", P_("Has padding"), P_("Whether the assistant adds padding around the page"),
-                            TRUE, G_PARAM_READWRITE));
 
   /* Bind class to template
    */
@@ -1019,9 +1073,9 @@ alternative_button_order (GtkAssistant *assistant)
 }
 
 static void
-on_page_notify (GtkWidget  *widget,
-                GParamSpec *arg,
-                gpointer    data)
+on_page_page_notify (GtkWidget  *widget,
+                     GParamSpec *arg,
+                     gpointer    data)
 {
   GtkAssistant *assistant = GTK_ASSISTANT (data);
 
@@ -1032,6 +1086,15 @@ on_page_notify (GtkWidget  *widget,
     }
 }
 
+static void
+on_page_notify (GtkAssistantPage *page,
+                GParamSpec *arg,
+                gpointer    data)
+{
+  if (page->page)
+    on_page_page_notify (page->page, arg, data);
+}
+
 static void
 assistant_remove_page_cb (GtkContainer *container,
                           GtkWidget    *page,
@@ -1072,7 +1135,8 @@ assistant_remove_page_cb (GtkContainer *container,
         }
     }
 
-  g_signal_handlers_disconnect_by_func (page_info->page, on_page_notify, assistant);
+  g_signal_handlers_disconnect_by_func (page_info->page, on_page_page_notify, assistant);
+  g_signal_handlers_disconnect_by_func (page_info, on_page_notify, assistant);
 
   gtk_size_group_remove_widget (priv->title_size_group, page_info->regular_title);
   gtk_size_group_remove_widget (priv->title_size_group, page_info->current_title);
@@ -1083,9 +1147,8 @@ assistant_remove_page_cb (GtkContainer *container,
   priv->pages = g_list_remove_link (priv->pages, element);
   priv->visited_pages = g_slist_remove_all (priv->visited_pages, page_info);
 
-  g_free (page_info->title);
+  g_object_unref (page_info);
 
-  g_slice_free (GtkAssistantPage, page_info);
   g_list_free_1 (element);
 
   if (gtk_widget_get_mapped (GTK_WIDGET (assistant)))
@@ -1132,65 +1195,121 @@ gtk_assistant_init (GtkAssistant *assistant)
 }
 
 static void
-gtk_assistant_set_child_property (GtkContainer *container,
-                                  GtkWidget    *child,
-                                  guint         property_id,
-                                  const GValue *value,
-                                  GParamSpec   *pspec)
+gtk_assistant_page_set_property (GObject      *object,
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
 {
+  GtkAssistantPage *page = GTK_ASSISTANT_PAGE (object);
+  GtkWidget *assistant = NULL;
+
+  if (page->page)
+    assistant = gtk_widget_get_ancestor (page->page, GTK_TYPE_ASSISTANT);
+
   switch (property_id)
     {
+    case CHILD_PROP_CHILD:
+      g_set_object (&page->page, g_value_get_object (value));
+      break;
+
     case CHILD_PROP_PAGE_TYPE:
-      gtk_assistant_set_page_type (GTK_ASSISTANT (container), child,
-                                   g_value_get_enum (value));
+      if (page->type != g_value_get_enum (value))
+        {
+          page->type = g_value_get_enum (value);
+
+          /* backwards compatibility to the era before fixing bug 604289 */
+          if (page->type == GTK_ASSISTANT_PAGE_SUMMARY && !page->complete_set)
+            {
+              page->complete = TRUE;
+              page->complete_set = FALSE;
+            }
+
+          /* Always set buttons state, a change in a future page
+           * might change current page buttons
+           */
+          if (assistant)
+            update_buttons_state (GTK_ASSISTANT (assistant));
+          g_object_notify (G_OBJECT (page), "page-type");
+        }
       break;
+
     case CHILD_PROP_PAGE_TITLE:
-      gtk_assistant_set_page_title (GTK_ASSISTANT (container), child,
-                                    g_value_get_string (value));
+      g_free (page->title);
+      page->title = g_value_dup_string (value);
+
+      if (assistant)
+        {
+          gtk_label_set_text ((GtkLabel*) page->regular_title, page->title);
+          gtk_label_set_text ((GtkLabel*) page->current_title, page->title);
+          update_title_state (GTK_ASSISTANT (assistant));
+        }
+
+      g_object_notify (G_OBJECT (page), "title");
+
       break;
+
     case CHILD_PROP_PAGE_COMPLETE:
-      gtk_assistant_set_page_complete (GTK_ASSISTANT (container), child,
-                                       g_value_get_boolean (value));
+      if (page->complete != g_value_get_boolean (value))
+        {
+          page->complete = g_value_get_boolean (value);
+          page->complete_set = TRUE;
+
+          /* Always set buttons state, a change in a future page
+           * might change current page buttons
+           */
+          if (assistant)
+            update_buttons_state (GTK_ASSISTANT (assistant));
+          g_object_notify (G_OBJECT (page), "complete");
+        }
       break;
+
     case CHILD_PROP_HAS_PADDING:
-      gtk_assistant_set_page_has_padding (GTK_ASSISTANT (container), child,
-                                          g_value_get_boolean (value));
+      if (page->has_padding != g_value_get_boolean (value))
+        {
+          page->has_padding = g_value_get_boolean (value);
+          g_object_set (page->box, "margin", page->has_padding ? 12 : 0, NULL);
+          g_object_notify (G_OBJECT (page), "has-padding");
+        }
       break;
+
     default:
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
     }
 }
 
 static void
-gtk_assistant_get_child_property (GtkContainer *container,
-                                  GtkWidget    *child,
-                                  guint         property_id,
-                                  GValue       *value,
-                                  GParamSpec   *pspec)
+gtk_assistant_page_get_property (GObject      *object,
+                                 guint         property_id,
+                                 GValue       *value,
+                                 GParamSpec   *pspec)
 {
-  GtkAssistant *assistant = GTK_ASSISTANT (container);
+  GtkAssistantPage *page = GTK_ASSISTANT_PAGE (object);
 
   switch (property_id)
     {
+    case CHILD_PROP_CHILD:
+      g_value_set_object (value, page->page);
+      break;
+
     case CHILD_PROP_PAGE_TYPE:
-      g_value_set_enum (value,
-                        gtk_assistant_get_page_type (assistant, child));
+      g_value_set_enum (value, page->type);
       break;
+
     case CHILD_PROP_PAGE_TITLE:
-      g_value_set_string (value,
-                          gtk_assistant_get_page_title (assistant, child));
+      g_value_set_string (value, page->title);
       break;
+
     case CHILD_PROP_PAGE_COMPLETE:
-      g_value_set_boolean (value,
-                           gtk_assistant_get_page_complete (assistant, child));
+      g_value_set_boolean (value, page->complete);
       break;
+
     case CHILD_PROP_HAS_PADDING:
-      g_value_set_boolean (value,
-                           gtk_assistant_get_page_has_padding (assistant, child));
+      g_value_set_boolean (value, page->has_padding);
       break;
+
     default:
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
     }
 }
@@ -1342,13 +1461,14 @@ gtk_assistant_add (GtkContainer *container,
    * For the first invocation (from the builder template invocation),
    * let's make sure we add the actual direct container content properly.
    */
-  if (!gtk_bin_get_child (GTK_BIN (container)))
+  if (!GTK_ASSISTANT (container)->priv->constructed)
     {
       gtk_widget_set_parent (page, GTK_WIDGET (container));
       _gtk_bin_set_child (GTK_BIN (container), page);
       return;
     }
 
+g_print ("after template init\n");
   gtk_assistant_append_page (GTK_ASSISTANT (container), page);
 }
 
@@ -1639,25 +1759,33 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
                            GtkWidget    *page,
                            gint          position)
 {
-  GtkAssistantPrivate *priv;
   GtkAssistantPage *page_info;
-  gint n_pages;
-  GtkStyleContext *context;
-  GtkWidget *box;
-  GtkWidget *sibling;
 
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), 0);
   g_return_val_if_fail (GTK_IS_WIDGET (page), 0);
   g_return_val_if_fail (gtk_widget_get_parent (page) == NULL, 0);
   g_return_val_if_fail (!gtk_widget_is_toplevel (page), 0);
 
-  priv = assistant->priv;
-
-  page_info = g_slice_new0 (GtkAssistantPage);
-  page_info->page  = page;
-  page_info->regular_title = gtk_label_new (NULL);
+  page_info = g_object_new (GTK_TYPE_ASSISTANT_PAGE, NULL);
+  page_info->page = g_object_ref (page);
   page_info->has_padding = TRUE;
-  page_info->current_title = gtk_label_new (NULL);
+
+  return gtk_assistant_add_page (assistant, page_info, position);
+}
+
+static int
+gtk_assistant_add_page (GtkAssistant *assistant,
+                        GtkAssistantPage *page_info,
+                        gint position)
+{
+  GtkAssistantPrivate *priv = assistant->priv;
+  gint n_pages;
+  GtkStyleContext *context;
+  GtkWidget *box;
+  GtkWidget *sibling;
+
+  page_info->regular_title = gtk_label_new (page_info->title);
+  page_info->current_title = gtk_label_new (page_info->title);
 
   gtk_label_set_xalign (GTK_LABEL (page_info->regular_title), 0.0);
   gtk_label_set_xalign (GTK_LABEL (page_info->current_title), 0.0);
@@ -1671,13 +1799,13 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
   gtk_size_group_add_widget (priv->title_size_group, page_info->regular_title);
   gtk_size_group_add_widget (priv->title_size_group, page_info->current_title);
 
-  g_signal_connect (G_OBJECT (page), "notify::visible",
+  g_signal_connect (G_OBJECT (page_info->page), "notify::visible",
+                    G_CALLBACK (on_page_page_notify), assistant);
+
+  g_signal_connect (G_OBJECT (page_info), "notify::page-title",
                     G_CALLBACK (on_page_notify), assistant);
 
-  g_signal_connect (G_OBJECT (page), "child-notify::page-title",
-                    G_CALLBACK (on_page_notify), assistant);
-
-  g_signal_connect (G_OBJECT (page), "child-notify::page-type",
+  g_signal_connect (G_OBJECT (page_info), "notify::page-type",
                     G_CALLBACK (on_page_notify), assistant);
 
   n_pages = g_list_length (priv->pages);
@@ -1702,7 +1830,7 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_show (box);
-  gtk_container_add (GTK_CONTAINER (box), page);
+  gtk_container_add (GTK_CONTAINER (box), page_info->page);
   g_object_set (box, "margin", 12, NULL);
   g_signal_connect (box, "remove", G_CALLBACK (assistant_remove_page_cb), assistant);
 
@@ -1893,15 +2021,7 @@ gtk_assistant_set_page_title (GtkAssistant *assistant,
 
   page_info = (GtkAssistantPage*) child->data;
 
-  g_free (page_info->title);
-  page_info->title = g_strdup (title);
-
-  gtk_label_set_text ((GtkLabel*) page_info->regular_title, title);
-  gtk_label_set_text ((GtkLabel*) page_info->current_title, title);
-
-  update_title_state (assistant);
-
-  gtk_container_child_notify (GTK_CONTAINER (assistant), page, "title");
+  g_object_set (page_info, "title", title, NULL);
 }
 
 /**
@@ -1959,24 +2079,7 @@ gtk_assistant_set_page_type (GtkAssistant         *assistant,
 
   page_info = (GtkAssistantPage*) child->data;
 
-  if (type != page_info->type)
-    {
-      page_info->type = type;
-
-      /* backwards compatibility to the era before fixing bug 604289 */
-      if (type == GTK_ASSISTANT_PAGE_SUMMARY && !page_info->complete_set)
-        {
-          gtk_assistant_set_page_complete (assistant, page, TRUE);
-          page_info->complete_set = FALSE;
-        }
-
-      /* Always set buttons state, a change in a future page
-       * might change current page buttons
-       */
-      update_buttons_state (assistant);
-
-      gtk_container_child_notify (GTK_CONTAINER (assistant), page, "page-type");
-    }
+  g_object_set (page_info, "page-type", type, NULL);
 }
 
 /**
@@ -2035,18 +2138,7 @@ gtk_assistant_set_page_complete (GtkAssistant *assistant,
 
   page_info = (GtkAssistantPage*) child->data;
 
-  if (complete != page_info->complete)
-    {
-      page_info->complete = complete;
-      page_info->complete_set = TRUE;
-
-      /* Always set buttons state, a change in a future page
-       * might change current page buttons
-       */
-      update_buttons_state (assistant);
-
-      gtk_container_child_notify (GTK_CONTAINER (assistant), page, "complete");
-    }
+  g_object_set (page_info, "complete", complete, NULL);
 }
 
 /**
@@ -2103,16 +2195,7 @@ gtk_assistant_set_page_has_padding (GtkAssistant *assistant,
 
   page_info = (GtkAssistantPage*) child->data;
 
-  if (page_info->has_padding != has_padding)
-    {
-      page_info->has_padding = has_padding;
-
-      g_object_set (page_info->box,
-                    "margin", has_padding ? 12 : 0,
-                    NULL);
-
-      gtk_container_child_notify (GTK_CONTAINER (assistant), page, "has-padding");
-    }
+  g_object_set (page_info, "has-padding", has_padding, NULL);
 }
 
 /**
@@ -2285,6 +2368,27 @@ gtk_assistant_buildable_interface_init (GtkBuildableIface *iface)
   parent_buildable_iface = g_type_interface_peek_parent (iface);
   iface->custom_tag_start = gtk_assistant_buildable_custom_tag_start;
   iface->custom_finished = gtk_assistant_buildable_custom_finished;
+  iface->add_child = gtk_assistant_buildable_add_child;
+}
+
+static void
+gtk_assistant_buildable_add_child (GtkBuildable *buildable,
+                                   GtkBuilder   *builder,
+                                   GObject      *child,
+                                   const char   *type)
+{
+  if (GTK_IS_ASSISTANT_PAGE (child))
+    gtk_assistant_add_page (GTK_ASSISTANT (buildable), GTK_ASSISTANT_PAGE (child), -1);
+  else if (type && g_str_equal (type, "titlebar"))
+    {
+      GtkAssistant *assistant = GTK_ASSISTANT (buildable);
+      assistant->priv->headerbar = GTK_WIDGET (child);
+      gtk_window_set_titlebar (GTK_WINDOW (buildable), assistant->priv->headerbar);
+    }
+  else if (GTK_IS_WIDGET (child))
+    gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
+  else
+    g_warning ("Can't add a child of type '%s' to '%s'", G_OBJECT_TYPE_NAME (child), G_OBJECT_TYPE_NAME (buildable));
 }
 
 gboolean
@@ -2309,3 +2413,36 @@ gtk_assistant_buildable_custom_finished (GtkBuildable *buildable,
   parent_buildable_iface->custom_finished (buildable, builder, child,
                                            tagname, user_data);
 }
+
+/**
+ * gtk_assistant_get_page:
+ * @assistant: a #GtkAssistant
+ * @child: a child of @assistant
+ *
+ * Returns the #GtkAssistantPage object for @child.
+ *
+ * Returns: (transfer none): the #GtkAssistantPage for @child
+ */
+GtkAssistantPage *
+gtk_assistant_get_page (GtkAssistant *assistant,
+                        GtkWidget    *child)
+{
+  GList *page_info = find_page (assistant, child);
+  return (GtkAssistantPage *) (page_info ? page_info->data : NULL);
+}
+
+/**
+ * gtk_assistant_page_get_child:
+ * @page: a #GtkAssistantPage
+ *
+ * Returns the child to which @page belongs.
+ *
+ * Returns: (transfer none): the child to which @page belongs
+ */
+GtkWidget *
+gtk_assistant_page_get_child (GtkAssistantPage *page)
+{
+  return page->page;
+}
+
+
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 5d5629a9f1..0a09b3162b 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -118,6 +118,16 @@ struct _GtkAssistantClass
   void (*_gtk_reserved5) (void);
 };
 
+#define GTK_TYPE_ASSISTANT_PAGE (gtk_assistant_page_get_type ())
+#define GTK_ASSISTANT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASSISTANT_PAGE, GtkAssistantPage))
+#define GTK_ASSISTANT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASSISTANT_PAGE, GtkAssistantPageClass))
+#define GTK_IS_ASSISTANT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ASSISTANT_PAGE))
+#define GTK_IS_ASSISTANT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASSISTANT_PAGE))
+#define GTK_ASSISTANT_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASSISTANT_PAGE, GtkAssistantPageClass))
+
+typedef struct _GtkAssistantPage GtkAssistantPage;
+typedef struct _GtkAssistantPageClass GtkAssistantPageClass;
+
 /**
  * GtkAssistantPageFunc:
  * @current_page: The page number used to calculate the next page.
@@ -132,6 +142,8 @@ struct _GtkAssistantClass
  */
 typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
 
+GDK_AVAILABLE_IN_ALL
+GType                 gtk_assistant_page_get_type         (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
@@ -209,6 +221,12 @@ void                  gtk_assistant_set_page_has_padding  (GtkAssistant *assista
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_assistant_get_page_has_padding  (GtkAssistant *assistant,
                                                            GtkWidget    *page);
+GDK_AVAILABLE_IN_ALL
+GtkAssistantPage *    gtk_assistant_get_page       (GtkAssistant     *assistant,
+                                                    GtkWidget        *child);
+GDK_AVAILABLE_IN_ALL
+GtkWidget *           gtk_assistant_page_get_child (GtkAssistantPage *page);
+
 
 G_END_DECLS
 
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 52244862ac..cbbed790b9 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -536,7 +536,7 @@ gtk_builder_get_parameters (GtkBuilder         *builder,
           (G_PARAM_SPEC_VALUE_TYPE (prop->pspec) != G_TYPE_FILE))
         {
           GObject *object = g_hash_table_lookup (priv->objects,
-                                                 prop->text->str);
+                                                 g_strstrip (prop->text->str));
 
           if (object)
             {
@@ -722,7 +722,9 @@ _gtk_builder_construct (GtkBuilder  *builder,
    * be set once.
    */
   if (info->constructor ||
-      (info->parent && ((ChildInfo*)info->parent)->internal_child != NULL))
+      (info->parent &&
+       info->parent->tag_type == TAG_CHILD &&
+       ((ChildInfo*)info->parent)->internal_child != NULL))
     param_filter_flags = G_PARAM_CONSTRUCT_ONLY;
   else
     param_filter_flags = G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY;
@@ -758,7 +760,9 @@ _gtk_builder_construct (GtkBuilder  *builder,
       if (construct_parameters->len)
         g_warning ("Can't pass in construct-only parameters to %s", info->id);
     }
-  else if (info->parent && ((ChildInfo*)info->parent)->internal_child != NULL)
+  else if (info->parent &&
+           info->parent->tag_type == TAG_CHILD &&
+           ((ChildInfo*)info->parent)->internal_child != NULL)
     {
       gchar *childname = ((ChildInfo*)info->parent)->internal_child;
       obj = gtk_builder_get_internal_child (builder, info, childname, error);
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 94c5b8b6c1..2c08df0f02 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -34,16 +34,6 @@
 static void free_property_info (PropertyInfo *info);
 static void free_object_info (ObjectInfo *info);
 
-enum {
-  TAG_PROPERTY,
-  TAG_MENU,
-  TAG_REQUIRES,
-  TAG_OBJECT,
-  TAG_CHILD,
-  TAG_SIGNAL,
-  TAG_INTERFACE,
-  TAG_TEMPLATE,
-};
 
 static inline void
 state_push (ParserData *data, gpointer info)
@@ -1066,6 +1056,12 @@ end_element (GMarkupParseContext  *context,
     {
       ObjectInfo *object_info = state_pop_info (data, ObjectInfo);
       ChildInfo* child_info = state_peek_info (data, ChildInfo);
+      PropertyInfo* prop_info = state_peek_info (data, PropertyInfo);
+
+      if (child_info && child_info->tag_type != TAG_CHILD)
+        child_info = NULL;
+      if (prop_info && prop_info->tag_type != TAG_PROPERTY)
+        prop_info = NULL;
 
       if (data->requested_objects && data->inside_requested_object &&
           (data->cur_object_level == data->requested_object_level))
@@ -1089,6 +1085,8 @@ end_element (GMarkupParseContext  *context,
         }
       if (child_info)
         child_info->object = object_info->object;
+      if (prop_info)
+        g_string_assign (prop_info->text, object_info->id);
 
       if (GTK_IS_BUILDABLE (object_info->object) &&
           GTK_BUILDABLE_GET_IFACE (object_info->object)->parser_finished)
diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index 22577df32d..5b71bdf76d 100644
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -21,6 +21,17 @@
 
 #include "gtkbuilder.h"
 
+enum {
+  TAG_PROPERTY,
+  TAG_MENU,
+  TAG_REQUIRES,
+  TAG_OBJECT,
+  TAG_CHILD,
+  TAG_SIGNAL,
+  TAG_INTERFACE,
+  TAG_TEMPLATE,
+};
+
 typedef struct {
   guint tag_type;
 } CommonInfo;
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 8dd90a51ec..58085d3135 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1877,4 +1877,3 @@ gtk_container_get_path_for_child (GtkContainer *container,
 
   return path;
 }
-
diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c
index 7b21eebc13..7439345373 100644
--- a/gtk/gtkmenusectionbox.c
+++ b/gtk/gtkmenusectionbox.c
@@ -303,7 +303,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
       g_object_bind_property (item, "sensitive", widget, "sensitive", G_BINDING_SYNC_CREATE);
 
       get_ancestors (GTK_WIDGET (box->toplevel), GTK_TYPE_STACK, &stack, &parent);
-      gtk_container_child_get (GTK_CONTAINER (stack), parent, "name", &name, NULL);
+      g_object_get (gtk_stack_get_page (GTK_STACK (stack), parent), "name", &name, NULL);
       gtk_menu_section_box_new_submenu (item, box->toplevel, widget, name);
       g_free (name);
     }
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index 860af7f59a..7ac18bfc79 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -52,8 +52,29 @@
  * These animations respect the #GtkSettings:gtk-enable-animations
  * setting.
  *
- * The GtkStack widget was added in GTK+ 3.10.
+ * GtkStack maintains a #GtkStackPage object for each added
+ * child, which holds additional per-child properties. You
+ * obtain the #GtkStackPage for a child with gtk_stack_get_page().
  *
+ * # GtkStack as GtkBuildable
+ *
+ * To set child-specific properties in a .ui file, create GtkStackPage
+ * objects explictly, and set the child widget as a property on it:
+ * |[
+ *   <object class="GtkStack" id="stack">
+ *     <child>
+ *       <object class="GtkStackPage">
+ *         <property name="name">page1</property>
+ *         <property name="title">In the beginning…</property>
+ *         <property name="child">
+ *           <object class="GtkLabel">
+ *             <property name="label">It was dark</property>
+ *           </object>
+ *         </property>
+ *       </object>
+ *     </child>
+ * ]|
+ * 
  * # CSS nodes
  *
  * GtkStack has a single CSS node named stack.
@@ -92,6 +113,39 @@
  *  filter events out events to the last_child widget during transitions
  */
 
+typedef struct {
+  GList *children;
+
+  GtkStackPage *visible_child;
+
+  gboolean hhomogeneous;
+  gboolean vhomogeneous;
+
+  GtkStackTransitionType transition_type;
+  guint transition_duration;
+
+  GtkStackPage *last_visible_child;
+  GskRenderNode *last_visible_node;
+  GtkAllocation last_visible_surface_allocation;
+  guint tick_id;
+  GtkProgressTracker tracker;
+  gboolean first_frame_skipped;
+
+  gint last_visible_widget_width;
+  gint last_visible_widget_height;
+
+  gboolean interpolate_size;
+
+  GtkStackTransitionType active_transition_type;
+
+} GtkStackPrivate;
+
+static void gtk_stack_buildable_interface_init (GtkBuildableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkStack, gtk_stack, GTK_TYPE_CONTAINER,
+                         G_ADD_PRIVATE (GtkStack)
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                gtk_stack_buildable_interface_init))
 enum  {
   PROP_0,
   PROP_HOMOGENEOUS,
@@ -109,6 +163,7 @@ enum  {
 enum
 {
   CHILD_PROP_0,
+  CHILD_PROP_CHILD,
   CHILD_PROP_NAME,
   CHILD_PROP_TITLE,
   CHILD_PROP_ICON_NAME,
@@ -117,9 +172,8 @@ enum
   LAST_CHILD_PROP
 };
 
-typedef struct _GtkStackChildInfo GtkStackChildInfo;
-
-struct _GtkStackChildInfo {
+struct _GtkStackPage {
+  GObject instance;
   GtkWidget *widget;
   gchar *name;
   gchar *title;
@@ -128,36 +182,223 @@ struct _GtkStackChildInfo {
   GtkWidget *last_focus;
 };
 
-typedef struct {
-  GList *children;
-
-  GtkStackChildInfo *visible_child;
-
-  gboolean hhomogeneous;
-  gboolean vhomogeneous;
-
-  GtkStackTransitionType transition_type;
-  guint transition_duration;
-
-  GtkStackChildInfo *last_visible_child;
-  GskRenderNode *last_visible_node;
-  GtkAllocation last_visible_surface_allocation;
-  guint tick_id;
-  GtkProgressTracker tracker;
-  gboolean first_frame_skipped;
-
-  gint last_visible_widget_width;
-  gint last_visible_widget_height;
-
-  gboolean interpolate_size;
-
-  GtkStackTransitionType active_transition_type;
-
-} GtkStackPrivate;
+struct _GtkStackPageClass {
+  GObjectClass parent_class;
+};
 
 static GParamSpec *stack_props[LAST_PROP] = { NULL, };
 static GParamSpec *stack_child_props[LAST_CHILD_PROP] = { NULL, };
 
+G_DEFINE_TYPE (GtkStackPage, gtk_stack_page, G_TYPE_OBJECT)
+
+static void
+gtk_stack_page_init (GtkStackPage *page)
+{
+}
+
+static void
+gtk_stack_page_finalize (GObject *object)
+{
+  GtkStackPage *page = GTK_STACK_PAGE (object);
+
+  g_clear_object (&page->widget);
+  g_free (page->name);
+  g_free (page->title);
+  g_free (page->icon_name);
+
+  if (page->last_focus)
+    g_object_remove_weak_pointer (G_OBJECT (page->last_focus),
+                                  (gpointer *)&page->last_focus);
+
+  G_OBJECT_CLASS (gtk_stack_page_parent_class)->finalize (object);
+}
+
+static void
+gtk_stack_page_get_property (GObject      *object,
+                             guint         property_id,
+                             GValue       *value,
+                             GParamSpec   *pspec)
+{
+  GtkStackPage *info = GTK_STACK_PAGE (object);
+  GtkWidget *stack = gtk_widget_get_parent (GTK_WIDGET (info->widget));
+  GtkStackPrivate *priv = gtk_stack_get_instance_private (GTK_STACK (stack));
+
+  switch (property_id)
+    {
+    case CHILD_PROP_CHILD:
+      g_value_set_object (value, info->widget);
+      break;
+
+    case CHILD_PROP_NAME:
+      g_value_set_string (value, info->name);
+      break;
+
+    case CHILD_PROP_TITLE:
+      g_value_set_string (value, info->title);
+      break;
+
+    case CHILD_PROP_ICON_NAME:
+      g_value_set_string (value, info->icon_name);
+      break;
+
+    case CHILD_PROP_POSITION:
+      g_value_set_int (value, g_list_index (priv->children, info));
+      break;
+
+    case CHILD_PROP_NEEDS_ATTENTION:
+      g_value_set_boolean (value, info->needs_attention);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void reorder_child (GtkStack  *stack,
+                           GtkWidget *child,
+                           gint       position);
+
+static void
+gtk_stack_page_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GtkStackPage *info = GTK_STACK_PAGE (object);
+  GtkWidget *stack = NULL;
+  GtkStackPrivate *priv = NULL;
+  gchar *name;
+  GList *l;
+
+  if (info->widget)
+    {
+      stack = gtk_widget_get_parent (info->widget);
+      if (stack)
+        priv = gtk_stack_get_instance_private (GTK_STACK (stack));
+    }
+
+  switch (property_id)
+    {
+    case CHILD_PROP_CHILD:
+      g_set_object (&info->widget, g_value_get_object (value));
+      break;
+
+    case CHILD_PROP_NAME:
+      name = g_value_dup_string (value);
+      for (l = priv ? priv->children : NULL; l != NULL; l = l->next)
+        {
+          GtkStackPage *info2 = l->data;
+          if (info == info2)
+            continue;
+          if (g_strcmp0 (info2->name, name) == 0)
+            {
+              g_warning ("Duplicate child name in GtkStack: %s", name);
+              break;
+            }
+        }
+
+      g_free (info->name);
+      info->name = name;
+
+      g_object_notify_by_pspec (object, pspec);
+
+      if (priv && priv->visible_child == info)
+        g_object_notify_by_pspec (G_OBJECT (stack),
+                                  stack_props[PROP_VISIBLE_CHILD_NAME]);
+
+      break;
+
+    case CHILD_PROP_TITLE:
+      g_free (info->title);
+      info->title = g_value_dup_string (value);
+      g_object_notify_by_pspec (object, pspec);
+      break;
+
+    case CHILD_PROP_ICON_NAME:
+      g_free (info->icon_name);
+      info->icon_name = g_value_dup_string (value);
+      g_object_notify_by_pspec (object, pspec);
+      break;
+
+    case CHILD_PROP_POSITION:
+      if (stack)
+        reorder_child (GTK_STACK (stack), info->widget, g_value_get_int (value));
+      break;
+
+    case CHILD_PROP_NEEDS_ATTENTION:
+      info->needs_attention = g_value_get_boolean (value);
+      g_object_notify_by_pspec (object, pspec);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+static void
+gtk_stack_page_class_init (GtkStackPageClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = gtk_stack_page_finalize;
+  object_class->get_property = gtk_stack_page_get_property;
+  object_class->set_property = gtk_stack_page_set_property;
+
+  stack_child_props[CHILD_PROP_CHILD] =
+    g_param_spec_object ("child",
+                         P_("Child"),
+                         P_("The child of the page"),
+                         GTK_TYPE_WIDGET,
+                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+  stack_child_props[CHILD_PROP_NAME] =
+    g_param_spec_string ("name",
+                         P_("Name"),
+                         P_("The name of the child page"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+  stack_child_props[CHILD_PROP_TITLE] =
+    g_param_spec_string ("title",
+                         P_("Title"),
+                         P_("The title of the child page"),
+                         NULL,
+                         GTK_PARAM_READWRITE);
+
+  stack_child_props[CHILD_PROP_ICON_NAME] =
+    g_param_spec_string ("icon-name",
+                         P_("Icon name"),
+                         P_("The icon name of the child page"),
+                         NULL,
+                         GTK_PARAM_READWRITE);
+
+  stack_child_props[CHILD_PROP_POSITION] =
+    g_param_spec_int ("position",
+                      P_("Position"),
+                      P_("The index of the child in the parent"),
+                      -1, G_MAXINT,
+                      0,
+                      GTK_PARAM_READWRITE);
+
+  /**
+   * GtkStack:needs-attention:
+   *
+   * Sets a flag specifying whether the child requires the user attention.
+   * This is used by the #GtkStackSwitcher to change the appearance of the
+   * corresponding button when a page needs attention and it is not the
+   * current one.
+   */
+  stack_child_props[CHILD_PROP_NEEDS_ATTENTION] =
+    g_param_spec_boolean ("needs-attention",
+                         P_("Needs Attention"),
+                         P_("Whether this page needs attention"),
+                         FALSE,
+                         GTK_PARAM_READWRITE);
+
+  g_object_class_install_properties (object_class, LAST_CHILD_PROP, stack_child_props);
+}
+
 static void     gtk_stack_add                            (GtkContainer  *widget,
                                                           GtkWidget     *child);
 static void     gtk_stack_remove                         (GtkContainer  *widget,
@@ -190,19 +431,31 @@ static void     gtk_stack_set_property                   (GObject       *object,
                                                           guint          property_id,
                                                           const GValue  *value,
                                                           GParamSpec    *pspec);
-static void     gtk_stack_get_child_property             (GtkContainer  *container,
-                                                          GtkWidget     *child,
-                                                          guint          property_id,
-                                                          GValue        *value,
-                                                          GParamSpec    *pspec);
-static void     gtk_stack_set_child_property             (GtkContainer  *container,
-                                                          GtkWidget     *child,
-                                                          guint          property_id,
-                                                          const GValue  *value,
-                                                          GParamSpec    *pspec);
 static void     gtk_stack_unschedule_ticks               (GtkStack      *stack);
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtkStack, gtk_stack, GTK_TYPE_CONTAINER)
+
+static void     gtk_stack_add_page                       (GtkStack     *stack,
+                                                          GtkStackPage *page);
+
+static void
+gtk_stack_buildable_add_child (GtkBuildable *buildable,
+                               GtkBuilder   *builder,
+                               GObject      *child,
+                               const char   *type)
+{
+  if (GTK_IS_STACK_PAGE (child))
+    gtk_stack_add_page (GTK_STACK (buildable), GTK_STACK_PAGE (child));
+  else if (GTK_IS_WIDGET (child))
+    gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
+  else
+    g_warning ("Can't add a child of type '%s' to '%s'", G_OBJECT_TYPE_NAME (child), G_OBJECT_TYPE_NAME (buildable));
+}
+
+static void
+gtk_stack_buildable_interface_init (GtkBuildableIface *iface)
+{
+  iface->add_child = gtk_stack_buildable_add_child;
+}
 
 static void
 gtk_stack_finalize (GObject *obj)
@@ -319,8 +572,6 @@ gtk_stack_class_init (GtkStackClass *klass)
   container_class->add = gtk_stack_add;
   container_class->remove = gtk_stack_remove;
   container_class->forall = gtk_stack_forall;
-  container_class->set_child_property = gtk_stack_set_child_property;
-  container_class->get_child_property = gtk_stack_get_child_property;
 
   stack_props[PROP_HOMOGENEOUS] =
       g_param_spec_boolean ("homogeneous", P_("Homogeneous"), P_("Homogeneous sizing"),
@@ -374,51 +625,6 @@ gtk_stack_class_init (GtkStackClass *klass)
 
   g_object_class_install_properties (object_class, LAST_PROP, stack_props);
 
-  stack_child_props[CHILD_PROP_NAME] =
-    g_param_spec_string ("name",
-                         P_("Name"),
-                         P_("The name of the child page"),
-                         NULL,
-                         GTK_PARAM_READWRITE);
-
-  stack_child_props[CHILD_PROP_TITLE] =
-    g_param_spec_string ("title",
-                         P_("Title"),
-                         P_("The title of the child page"),
-                         NULL,
-                         GTK_PARAM_READWRITE);
-
-  stack_child_props[CHILD_PROP_ICON_NAME] =
-    g_param_spec_string ("icon-name",
-                         P_("Icon name"),
-                         P_("The icon name of the child page"),
-                         NULL,
-                         GTK_PARAM_READWRITE);
-
-  stack_child_props[CHILD_PROP_POSITION] =
-    g_param_spec_int ("position",
-                      P_("Position"),
-                      P_("The index of the child in the parent"),
-                      -1, G_MAXINT,
-                      0,
-                      GTK_PARAM_READWRITE);
-
-  /**
-   * GtkStack:needs-attention:
-   *
-   * Sets a flag specifying whether the child requires the user attention.
-   * This is used by the #GtkStackSwitcher to change the appearance of the
-   * corresponding button when a page needs attention and it is not the
-   * current one.
-   */
-  stack_child_props[CHILD_PROP_NEEDS_ATTENTION] =
-    g_param_spec_boolean ("needs-attention",
-                         P_("Needs Attention"),
-                         P_("Whether this page needs attention"),
-                         FALSE,
-                         GTK_PARAM_READWRITE);
-
-  gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, stack_child_props);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STACK_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, I_("stack"));
@@ -437,12 +643,12 @@ gtk_stack_new (void)
   return g_object_new (GTK_TYPE_STACK, NULL);
 }
 
-static GtkStackChildInfo *
+static GtkStackPage *
 find_child_info_for_widget (GtkStack  *stack,
                             GtkWidget *child)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *info;
+  GtkStackPage *info;
   GList *l;
 
   for (l = priv->children; l != NULL; l = l->next)
@@ -464,7 +670,7 @@ reorder_child (GtkStack  *stack,
   GList *l;
   GList *old_link = NULL;
   GList *new_link = NULL;
-  GtkStackChildInfo *child_info = NULL;
+  GtkStackPage *child_info = NULL;
   gint num = 0;
 
   l = priv->children;
@@ -481,7 +687,7 @@ reorder_child (GtkStack  *stack,
 
       if (old_link == NULL)
         {
-          GtkStackChildInfo *info;
+          GtkStackPage *info;
           info = l->data;
 
           /* Keep trying to find the current position and link location of the child */
@@ -507,126 +713,6 @@ reorder_child (GtkStack  *stack,
   gtk_container_child_notify_by_pspec (GTK_CONTAINER (stack), child, stack_child_props[CHILD_PROP_POSITION]);
 }
 
-static void
-gtk_stack_get_child_property (GtkContainer *container,
-                              GtkWidget    *child,
-                              guint         property_id,
-                              GValue       *value,
-                              GParamSpec   *pspec)
-{
-  GtkStack *stack = GTK_STACK (container);
-  GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *info;
-
-  info = find_child_info_for_widget (stack, child);
-  if (info == NULL)
-    {
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      return;
-    }
-
-  switch (property_id)
-    {
-    case CHILD_PROP_NAME:
-      g_value_set_string (value, info->name);
-      break;
-
-    case CHILD_PROP_TITLE:
-      g_value_set_string (value, info->title);
-      break;
-
-    case CHILD_PROP_ICON_NAME:
-      g_value_set_string (value, info->icon_name);
-      break;
-
-    case CHILD_PROP_POSITION:
-      g_value_set_int (value, g_list_index (priv->children, info));
-      break;
-
-    case CHILD_PROP_NEEDS_ATTENTION:
-      g_value_set_boolean (value, info->needs_attention);
-      break;
-
-    default:
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_stack_set_child_property (GtkContainer *container,
-                              GtkWidget    *child,
-                              guint         property_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
-{
-  GtkStack *stack = GTK_STACK (container);
-  GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *info;
-  GtkStackChildInfo *info2;
-  gchar *name;
-  GList *l;
-
-  info = find_child_info_for_widget (stack, child);
-  if (info == NULL)
-    {
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      return;
-    }
-
-  switch (property_id)
-    {
-    case CHILD_PROP_NAME:
-      name = g_value_dup_string (value);
-      for (l = priv->children; l != NULL; l = l->next)
-        {
-          info2 = l->data;
-          if (info == info2)
-            continue;
-          if (g_strcmp0 (info2->name, name) == 0)
-            {
-              g_warning ("Duplicate child name in GtkStack: %s", name);
-              break;
-            }
-        }
-
-      g_free (info->name);
-      info->name = name;
-
-      gtk_container_child_notify_by_pspec (container, child, pspec);
-
-      if (priv->visible_child == info)
-        g_object_notify_by_pspec (G_OBJECT (stack),
-                                  stack_props[PROP_VISIBLE_CHILD_NAME]);
-
-      break;
-
-    case CHILD_PROP_TITLE:
-      g_free (info->title);
-      info->title = g_value_dup_string (value);
-      gtk_container_child_notify_by_pspec (container, child, pspec);
-      break;
-
-    case CHILD_PROP_ICON_NAME:
-      g_free (info->icon_name);
-      info->icon_name = g_value_dup_string (value);
-      gtk_container_child_notify_by_pspec (container, child, pspec);
-      break;
-
-    case CHILD_PROP_POSITION:
-      reorder_child (stack, child, g_value_get_int (value));
-      break;
-
-    case CHILD_PROP_NEEDS_ATTENTION:
-      info->needs_attention = g_value_get_boolean (value);
-      gtk_container_child_notify_by_pspec (container, child, pspec);
-      break;
-
-    default:
-      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
-      break;
-    }
-}
 
 static inline gboolean
 is_left_transition (GtkStackTransitionType transition_type)
@@ -922,12 +1008,12 @@ gtk_stack_start_transition (GtkStack               *stack,
 
 static void
 set_visible_child (GtkStack               *stack,
-                   GtkStackChildInfo      *child_info,
+                   GtkStackPage      *child_info,
                    GtkStackTransitionType  transition_type,
                    guint                   transition_duration)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *info;
+  GtkStackPage *info;
   GtkWidget *widget = GTK_WIDGET (stack);
   GList *l;
   GtkWidget *toplevel;
@@ -1061,7 +1147,7 @@ stack_child_visibility_notify_cb (GObject    *obj,
   GtkStack *stack = GTK_STACK (user_data);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
   GtkWidget *child = GTK_WIDGET (obj);
-  GtkStackChildInfo *child_info;
+  GtkStackPage *child_info;
 
   child_info = find_child_info_for_widget (stack, child);
 
@@ -1079,6 +1165,12 @@ stack_child_visibility_notify_cb (GObject    *obj,
     }
 }
 
+static void
+gtk_stack_add_internal (GtkStack *stack,
+                        GtkWidget  *child,
+                        const char *name,
+                        const char *title);
+
 /**
  * gtk_stack_add_titled:
  * @stack: a #GtkStack
@@ -1100,11 +1192,7 @@ gtk_stack_add_titled (GtkStack   *stack,
   g_return_if_fail (GTK_IS_STACK (stack));
   g_return_if_fail (GTK_IS_WIDGET (child));
 
-  gtk_container_add_with_properties (GTK_CONTAINER (stack),
-                                     child,
-                                     "name", name,
-                                     "title", title,
-                                     NULL);
+  gtk_stack_add_internal (stack, child, name, title);
 }
 
 /**
@@ -1124,10 +1212,7 @@ gtk_stack_add_named (GtkStack   *stack,
   g_return_if_fail (GTK_IS_STACK (stack));
   g_return_if_fail (GTK_IS_WIDGET (child));
 
-  gtk_container_add_with_properties (GTK_CONTAINER (stack),
-                                     child,
-                                     "name", name,
-                                     NULL);
+  gtk_stack_add_internal (stack, child, name, NULL);
 }
 
 static void
@@ -1135,31 +1220,65 @@ gtk_stack_add (GtkContainer *container,
                GtkWidget    *child)
 {
   GtkStack *stack = GTK_STACK (container);
-  GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *child_info;
+
+  gtk_stack_add_internal (stack, child, NULL, NULL);
+}
+
+static void
+gtk_stack_add_internal (GtkStack   *stack,
+                        GtkWidget  *child,
+                        const char *name,
+                        const char *title)
+{
+  GtkStackPage *child_info;
 
   g_return_if_fail (child != NULL);
 
-  child_info = g_slice_new (GtkStackChildInfo);
-  child_info->widget = child;
-  child_info->name = NULL;
-  child_info->title = NULL;
+  child_info = g_object_new (GTK_TYPE_STACK_PAGE, NULL);
+  child_info->widget = g_object_ref (child);
+  child_info->name = g_strdup (name);
+  child_info->title = g_strdup (title);
   child_info->icon_name = NULL;
   child_info->needs_attention = FALSE;
   child_info->last_focus = NULL;
 
-  priv->children = g_list_append (priv->children, child_info);
+  gtk_stack_add_page (stack, child_info);
 
-  gtk_widget_set_child_visible (child, FALSE);
-  gtk_widget_set_parent (child, GTK_WIDGET (stack));
+  g_object_unref (child_info);
+}
 
-  g_signal_connect (child, "notify::visible",
+static void
+gtk_stack_add_page (GtkStack     *stack,
+                    GtkStackPage *child_info)
+{
+  GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
+  GList *l;
+
+  g_return_if_fail (child_info->widget != NULL);
+
+  for (l = priv->children; l != NULL; l = l->next)
+    {
+      GtkStackPage *info = l->data;
+      if (info->name &&
+          g_strcmp0 (info->name, child_info->name) == 0)
+        {
+          g_warning ("While adding page: duplicate child name in GtkStack: %s", child_info->name);
+          break;
+        }
+    }
+
+  priv->children = g_list_append (priv->children, g_object_ref (child_info));
+
+  gtk_widget_set_child_visible (child_info->widget, FALSE);
+  gtk_widget_set_parent (child_info->widget, GTK_WIDGET (stack));
+
+  g_signal_connect (child_info->widget, "notify::visible",
                     G_CALLBACK (stack_child_visibility_notify_cb), stack);
 
-  gtk_container_child_notify_by_pspec (container, child, stack_child_props[CHILD_PROP_POSITION]);
+  g_object_notify_by_pspec (G_OBJECT (child_info), stack_child_props[CHILD_PROP_POSITION]);
 
   if (priv->visible_child == NULL &&
-      gtk_widget_get_visible (child))
+      gtk_widget_get_visible (child_info->widget))
     set_visible_child (stack, child_info, priv->transition_type, priv->transition_duration);
 
   if (priv->hhomogeneous || priv->vhomogeneous || priv->visible_child == child_info)
@@ -1172,7 +1291,7 @@ gtk_stack_remove (GtkContainer *container,
 {
   GtkStack *stack = GTK_STACK (container);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *child_info;
+  GtkStackPage *child_info;
   gboolean was_visible;
 
   child_info = find_child_info_for_widget (stack, child);
@@ -1197,20 +1316,28 @@ gtk_stack_remove (GtkContainer *container,
 
   gtk_widget_unparent (child);
 
-  g_free (child_info->name);
-  g_free (child_info->title);
-  g_free (child_info->icon_name);
-
-  if (child_info->last_focus)
-    g_object_remove_weak_pointer (G_OBJECT (child_info->last_focus),
-                                  (gpointer *)&child_info->last_focus);
-
-  g_slice_free (GtkStackChildInfo, child_info);
+  g_object_unref (child_info);
 
   if ((priv->hhomogeneous || priv->vhomogeneous) && was_visible)
     gtk_widget_queue_resize (GTK_WIDGET (stack));
 }
 
+/**
+ * gtk_stack_get_page:
+ * @stack: a #GtkStack
+ * @child: a child of @stack
+ *
+ * Returns the #GtkStackPage object for @child.
+ * 
+ * Returns: (transfer none): the #GtkStackPage for @child
+ */
+GtkStackPage *
+gtk_stack_get_page (GtkStack  *stack,
+                    GtkWidget *child)
+{
+  return find_child_info_for_widget (stack, child);
+}
+
 /**
  * gtk_stack_get_child_by_name:
  * @stack: a #GtkStack
@@ -1227,7 +1354,7 @@ gtk_stack_get_child_by_name (GtkStack    *stack,
                              const gchar *name)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *info;
+  GtkStackPage *info;
   GList *l;
 
   g_return_val_if_fail (GTK_IS_STACK (stack), NULL);
@@ -1243,6 +1370,20 @@ gtk_stack_get_child_by_name (GtkStack    *stack,
   return NULL;
 }
 
+/**
+ * gtk_stack_page_get_child:
+ * @page: a #GtkStackPage
+ *
+ * Returns the stack child to which @page belongs.
+ *
+ * Returns: (transfer none): the child to which @page belongs
+ */
+GtkWidget *
+gtk_stack_page_get_child (GtkStackPage *page)
+{
+  return page->widget;
+}
+
 /**
  * gtk_stack_set_homogeneous:
  * @stack: a #GtkStack
@@ -1630,7 +1771,7 @@ gtk_stack_set_visible_child (GtkStack  *stack,
                              GtkWidget *child)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *child_info;
+  GtkStackPage *child_info;
 
   g_return_if_fail (GTK_IS_STACK (stack));
   g_return_if_fail (GTK_IS_WIDGET (child));
@@ -1694,7 +1835,7 @@ gtk_stack_set_visible_child_full (GtkStack               *stack,
                                   GtkStackTransitionType  transition)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *child_info, *info;
+  GtkStackPage *child_info, *info;
   GList *l;
 
   g_return_if_fail (GTK_IS_STACK (stack));
@@ -1731,7 +1872,7 @@ gtk_stack_forall (GtkContainer *container,
 {
   GtkStack *stack = GTK_STACK (container);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *child_info;
+  GtkStackPage *child_info;
   GList *l;
 
   l = priv->children;
@@ -1753,7 +1894,7 @@ gtk_stack_compute_expand (GtkWidget *widget,
   GtkStack *stack = GTK_STACK (widget);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
   gboolean hexpand, vexpand;
-  GtkStackChildInfo *child_info;
+  GtkStackPage *child_info;
   GtkWidget *child;
   GList *l;
 
@@ -2088,7 +2229,7 @@ gtk_stack_measure (GtkWidget      *widget,
 {
   GtkStack *stack = GTK_STACK (widget);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
-  GtkStackChildInfo *child_info;
+  GtkStackPage *child_info;
   GtkWidget *child;
   gint child_min, child_nat;
   GList *l;
diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h
index b9b4701cf4..6379328041 100644
--- a/gtk/gtkstack.h
+++ b/gtk/gtkstack.h
@@ -41,6 +41,16 @@ G_BEGIN_DECLS
 typedef struct _GtkStack GtkStack;
 typedef struct _GtkStackClass GtkStackClass;
 
+#define GTK_TYPE_STACK_PAGE (gtk_stack_page_get_type ())
+#define GTK_STACK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK_PAGE, GtkStackPage))
+#define GTK_STACK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK_PAGE, GtkStackPageClass))
+#define GTK_IS_STACK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK_PAGE))
+#define GTK_IS_STACK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK_PAGE))
+#define GTK_STACK_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK_PAGE, GtkStackPageClass))
+
+typedef struct _GtkStackPage GtkStackPage;
+typedef struct _GtkStackPageClass GtkStackPageClass;
+
 typedef enum {
   GTK_STACK_TRANSITION_TYPE_NONE,
   GTK_STACK_TRANSITION_TYPE_CROSSFADE,
@@ -72,6 +82,9 @@ struct _GtkStackClass {
   GtkContainerClass parent_class;
 };
 
+GDK_AVAILABLE_IN_ALL
+GType                  gtk_stack_page_get_type           (void) G_GNUC_CONST;
+
 GDK_AVAILABLE_IN_ALL
 GType                  gtk_stack_get_type                (void) G_GNUC_CONST;
 
@@ -86,6 +99,13 @@ void                   gtk_stack_add_titled              (GtkStack
                                                           GtkWidget              *child,
                                                           const gchar            *name,
                                                           const gchar            *title);
+
+GDK_AVAILABLE_IN_ALL
+GtkStackPage *         gtk_stack_get_page                (GtkStack               *stack,
+                                                          GtkWidget              *child);
+GDK_AVAILABLE_IN_ALL
+GtkWidget *            gtk_stack_page_get_child          (GtkStackPage           *page);
+
 GDK_AVAILABLE_IN_ALL
 GtkWidget *            gtk_stack_get_child_by_name       (GtkStack               *stack,
                                                           const gchar            *name);
diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c
index 552dcab9f8..4e42e1ea2d 100644
--- a/gtk/gtkstacksidebar.c
+++ b/gtk/gtkstacksidebar.c
@@ -140,7 +140,7 @@ sort_list (GtkListBoxRow *row1,
     {
       item = gtk_bin_get_child (GTK_BIN (row1));
       widget = g_object_get_data (G_OBJECT (item), "stack-child");
-      gtk_container_child_get (GTK_CONTAINER (priv->stack), widget,
+      g_object_get (gtk_stack_get_page (GTK_STACK (priv->stack), widget),
                                "position", &left,
                                NULL);
     }
@@ -149,7 +149,7 @@ sort_list (GtkListBoxRow *row1,
     {
       item = gtk_bin_get_child (GTK_BIN (row2));
       widget = g_object_get_data (G_OBJECT (item), "stack-child");
-      gtk_container_child_get (GTK_CONTAINER (priv->stack), widget,
+      g_object_get (gtk_stack_get_page (GTK_STACK (priv->stack), widget),
                                "position", &right,
                                NULL);
     }
@@ -227,10 +227,10 @@ update_row (GtkStackSidebar *sidebar,
   gboolean needs_attention;
   GtkStyleContext *context;
 
-  gtk_container_child_get (GTK_CONTAINER (priv->stack), widget,
-                           "title", &title,
-                           "needs-attention", &needs_attention,
-                           NULL);
+  g_object_get (gtk_stack_get_page (GTK_STACK (priv->stack), widget),
+                "title", &title,
+                "needs-attention", &needs_attention,
+                NULL);
 
   item = gtk_bin_get_child (GTK_BIN (row));
   gtk_label_set_text (GTK_LABEL (item), title);
@@ -275,6 +275,7 @@ add_child (GtkWidget       *widget,
   GtkStackSidebarPrivate *priv = gtk_stack_sidebar_get_instance_private (sidebar);
   GtkWidget *item;
   GtkWidget *row;
+  GObject *page;
 
   /* Check we don't actually already know about this widget */
   if (g_hash_table_lookup (priv->rows, widget))
@@ -291,13 +292,14 @@ add_child (GtkWidget       *widget,
   update_row (sidebar, widget, row);
 
   /* Hook up for events */
-  g_signal_connect (widget, "child-notify::title",
-                    G_CALLBACK (on_child_updated), sidebar);
-  g_signal_connect (widget, "child-notify::needs-attention",
-                    G_CALLBACK (on_child_updated), sidebar);
+  page = gtk_stack_get_page (GTK_STACK (priv->stack), widget);
   g_signal_connect (widget, "notify::visible",
                     G_CALLBACK (on_child_updated), sidebar);
-  g_signal_connect (widget, "child-notify::position",
+  g_signal_connect (page, "notify::title",
+                    G_CALLBACK (on_child_updated), sidebar);
+  g_signal_connect (page, "notify::needs-attention",
+                    G_CALLBACK (on_child_updated), sidebar);
+  g_signal_connect (page, "notify::position",
                     G_CALLBACK (on_position_updated), sidebar);
 
   g_object_set_data (G_OBJECT (item), I_("stack-child"), widget);
@@ -316,8 +318,15 @@ remove_child (GtkWidget       *widget,
   if (!row)
     return;
 
-  g_signal_handlers_disconnect_by_func (widget, on_child_updated, sidebar);
-  g_signal_handlers_disconnect_by_func (widget, on_position_updated, sidebar);
+  if (priv->stack)
+    {
+      GObject *page = gtk_stack_get_page (GTK_STACK (priv->stack), widget);
+      if (page)
+        {
+          g_signal_handlers_disconnect_by_func (page, on_child_updated, sidebar);
+          g_signal_handlers_disconnect_by_func (page, on_position_updated, sidebar);
+        }
+    }
 
   gtk_container_remove (GTK_CONTAINER (priv->list), row);
   g_hash_table_remove (priv->rows, widget);
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index 3fb4dde191..ab9d91b27d 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -159,25 +159,6 @@ rebuild_child (GtkWidget   *self,
     }
 }
 
-static void
-update_needs_attention (GtkWidget *widget, GtkWidget *button, gpointer data)
-{
-  GtkContainer *container;
-  gboolean needs_attention;
-  GtkStyleContext *context;
-
-  container = GTK_CONTAINER (data);
-  gtk_container_child_get (container, widget,
-                           "needs-attention", &needs_attention,
-                           NULL);
-
-  context = gtk_widget_get_style_context (button);
-  if (needs_attention)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_NEEDS_ATTENTION);
-  else
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_NEEDS_ATTENTION);
-}
-
 static void
 update_button (GtkStackSwitcher *self,
                GtkWidget        *widget,
@@ -185,29 +166,35 @@ update_button (GtkStackSwitcher *self,
 {
   gchar *title;
   gchar *icon_name;
+  gboolean needs_attention;
   GtkStackSwitcherPrivate *priv;
-
+  GtkStyleContext *context;
   priv = gtk_stack_switcher_get_instance_private (self);
 
-  gtk_container_child_get (GTK_CONTAINER (priv->stack), widget,
-                           "title", &title,
-                           "icon-name", &icon_name,
-                           NULL);
+  g_object_get (gtk_stack_get_page (priv->stack, widget),
+                "title", &title,
+                "icon-name", &icon_name,
+                "needs-attention", &needs_attention,
+                NULL);
 
   rebuild_child (button, icon_name, title);
 
   gtk_widget_set_visible (button, gtk_widget_get_visible (widget) && (title != NULL || icon_name != NULL));
 
+  context = gtk_widget_get_style_context (button);
+  if (needs_attention)
+    gtk_style_context_add_class (context, GTK_STYLE_CLASS_NEEDS_ATTENTION);
+  else
+    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_NEEDS_ATTENTION);
+
   g_free (title);
   g_free (icon_name);
-
-  update_needs_attention (widget, button, priv->stack);
 }
 
 static void
-on_title_icon_visible_updated (GtkWidget        *widget,
-                               GParamSpec       *pspec,
-                               GtkStackSwitcher *self)
+on_visible_updated (GtkWidget        *widget,
+                    GParamSpec       *pspec,
+                    GtkStackSwitcher *self)
 {
   GtkWidget *button;
   GtkStackSwitcherPrivate *priv;
@@ -219,16 +206,34 @@ on_title_icon_visible_updated (GtkWidget        *widget,
 }
 
 static void
-on_position_updated (GtkWidget        *widget,
+on_title_icon_updated (GtkStackPage     *page,
+                       GParamSpec       *pspec,
+                       GtkStackSwitcher *self)
+{
+  GtkWidget *widget;
+  GtkWidget *button;
+  GtkStackSwitcherPrivate *priv;
+
+  priv = gtk_stack_switcher_get_instance_private (self);
+
+  widget = gtk_stack_page_get_child (page);
+  button = g_hash_table_lookup (priv->buttons, widget);
+  update_button (self, widget, button);
+}
+
+static void
+on_position_updated (GtkStackPage     *page,
                      GParamSpec       *pspec,
                      GtkStackSwitcher *self)
 {
+  GtkWidget *widget;
   GtkWidget *button;
   gint position;
   GtkStackSwitcherPrivate *priv;
 
   priv = gtk_stack_switcher_get_instance_private (self);
 
+  widget = gtk_stack_page_get_child (page);
   button = g_hash_table_lookup (priv->buttons, widget);
 
   gtk_container_child_get (GTK_CONTAINER (priv->stack), widget,
@@ -248,15 +253,17 @@ on_position_updated (GtkWidget        *widget,
 }
 
 static void
-on_needs_attention_updated (GtkWidget        *widget,
+on_needs_attention_updated (GtkStackPage     *page,
                             GParamSpec       *pspec,
                             GtkStackSwitcher *self)
 {
+  GtkWidget *widget;
   GtkWidget *button;
   GtkStackSwitcherPrivate *priv;
 
   priv = gtk_stack_switcher_get_instance_private (self);
 
+  widget = gtk_stack_page_get_child (page);
   button = g_hash_table_lookup (priv->buttons, widget);
   update_button (self, widget, button);
 }
@@ -354,6 +361,7 @@ add_child (GtkWidget        *widget,
   GtkWidget *button;
   GList *group;
   GtkStackSwitcherPrivate *priv;
+  GtkStackPage *page;
 
   priv = gtk_stack_switcher_get_instance_private (self);
 
@@ -362,6 +370,7 @@ add_child (GtkWidget        *widget,
   gtk_widget_set_focus_on_click (button, FALSE);
   gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE);
 
+  page = gtk_stack_get_page (GTK_STACK (priv->stack), widget);
   update_button (self, widget, button);
 
   group = gtk_container_get_children (GTK_CONTAINER (self));
@@ -375,11 +384,11 @@ add_child (GtkWidget        *widget,
 
   g_object_set_data (G_OBJECT (button), "stack-child", widget);
   g_signal_connect (button, "clicked", G_CALLBACK (on_button_clicked), self);
-  g_signal_connect (widget, "notify::visible", G_CALLBACK (on_title_icon_visible_updated), self);
-  g_signal_connect (widget, "child-notify::title", G_CALLBACK (on_title_icon_visible_updated), self);
-  g_signal_connect (widget, "child-notify::icon-name", G_CALLBACK (on_title_icon_visible_updated), self);
-  g_signal_connect (widget, "child-notify::position", G_CALLBACK (on_position_updated), self);
-  g_signal_connect (widget, "child-notify::needs-attention", G_CALLBACK (on_needs_attention_updated), self);
+  g_signal_connect (widget, "notify::visible", G_CALLBACK (on_visible_updated), self);
+  g_signal_connect (page, "notify::title", G_CALLBACK (on_title_icon_updated), self);
+  g_signal_connect (page, "notify::icon-name", G_CALLBACK (on_title_icon_updated), self);
+  g_signal_connect (page, "notify::position", G_CALLBACK (on_position_updated), self);
+  g_signal_connect (page, "notify::needs-attention", G_CALLBACK (on_needs_attention_updated), self);
 
   g_hash_table_insert (priv->buttons, widget, button);
 }
@@ -393,10 +402,17 @@ remove_child (GtkWidget        *widget,
 
   priv = gtk_stack_switcher_get_instance_private (self);
 
-  g_signal_handlers_disconnect_by_func (widget, on_title_icon_visible_updated, self);
-  g_signal_handlers_disconnect_by_func (widget, on_position_updated, self);
-  g_signal_handlers_disconnect_by_func (widget, on_needs_attention_updated, self);
-
+  if (priv->stack)
+    {
+      GtkStackPage *page = gtk_stack_get_page (priv->stack, widget);
+      if (page)
+        {
+          g_signal_handlers_disconnect_by_func (page, on_title_icon_updated, self);
+          g_signal_handlers_disconnect_by_func (page, on_position_updated, self);
+          g_signal_handlers_disconnect_by_func (page, on_needs_attention_updated, self);
+        }
+      g_signal_handlers_disconnect_by_func (widget, on_visible_updated, self);
+    }
   button = g_hash_table_lookup (priv->buttons, widget);
   gtk_container_remove (GTK_CONTAINER (self), button);
   g_hash_table_remove (priv->buttons, widget);
diff --git a/gtk/inspector/actions.ui b/gtk/inspector/actions.ui
index eb958c83cd..06c3ca63b1 100644
--- a/gtk/inspector/actions.ui
+++ b/gtk/inspector/actions.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
diff --git a/gtk/inspector/css-editor.ui b/gtk/inspector/css-editor.ui
index e1b661ef2f..1425e9f447 100644
--- a/gtk/inspector/css-editor.ui
+++ b/gtk/inspector/css-editor.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkTextTagTable" id="tags">
     <child type="tag">
diff --git a/gtk/inspector/css-node-tree.ui b/gtk/inspector/css-node-tree.ui
index fcc97d6819..f05edfc5d6 100644
--- a/gtk/inspector/css-node-tree.ui
+++ b/gtk/inspector/css-node-tree.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="prop_model">
     <columns>
diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/data-list.ui
index b2ed65a3f3..fe2fe2d53b 100644
--- a/gtk/inspector/data-list.ui
+++ b/gtk/inspector/data-list.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorDataList" parent="GtkBox">
     <property name="orientation">vertical</property>
@@ -27,8 +26,7 @@
         <property name="expand">1</property>
         <property name="vscrollbar-policy">always</property>
         <child>
-          <object class="GtkTreeView" id="view">
-          </object>
+          <object class="GtkTreeView" id="view"/>
         </child>
       </object>
     </child>
diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui
index 07f4e130a2..05ad31ca86 100644
--- a/gtk/inspector/general.ui
+++ b/gtk/inspector/general.ui
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorGeneral" parent="GtkScrolledWindow">
     <property name="hscrollbar-policy">never</property>
-    <property name="vscrollbar-policy">automatic</property>
-    <property name="expand">0</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
diff --git a/gtk/inspector/gtkstackcombo.c b/gtk/inspector/gtkstackcombo.c
index 451863ddca..1be01c6732 100644
--- a/gtk/inspector/gtkstackcombo.c
+++ b/gtk/inspector/gtkstackcombo.c
@@ -81,10 +81,10 @@ add_child (GtkWidget     *widget,
     {
       char *name, *title;
 
-      gtk_container_child_get (GTK_CONTAINER (self->stack), widget,
-                               "name", &name,
-                              "title", &title,
-                               NULL);
+      g_object_get (gtk_stack_get_page (self->stack, widget),
+                    "name", &name,
+                    "title", &title,
+                    NULL);
 
       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (self->combo), name, title);
 
diff --git a/gtk/inspector/logs.ui b/gtk/inspector/logs.ui
index f93ce278cf..94dbd4f978 100644
--- a/gtk/inspector/logs.ui
+++ b/gtk/inspector/logs.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorLogs" parent="GtkBox">
     <child>
@@ -17,7 +16,7 @@
                 <property name="margin-bottom">10</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="weight" value="bold"/>
+                  <attribute name="weight" value="bold"></attribute>
                 </attributes>
               </object>
             </child>
@@ -98,7 +97,7 @@
                 <property name="margin-bottom">10</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="weight" value="bold"/>
+                  <attribute name="weight" value="bold"></attribute>
                 </attributes>
               </object>
             </child>
@@ -161,7 +160,7 @@
                 <property name="margin-bottom">10</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="weight" value="bold"/>
+                  <attribute name="weight" value="bold"></attribute>
                 </attributes>
               </object>
             </child>
diff --git a/gtk/inspector/magnifier.ui b/gtk/inspector/magnifier.ui
index 528f1069ed..27d72e9ba1 100644
--- a/gtk/inspector/magnifier.ui
+++ b/gtk/inspector/magnifier.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorMagnifier" parent="GtkBox">
     <property name="orientation">vertical</property>
diff --git a/gtk/inspector/menu.ui b/gtk/inspector/menu.ui
index 62e9e8fe00..42351b1368 100644
--- a/gtk/inspector/menu.ui
+++ b/gtk/inspector/menu.ui
@@ -1,17 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
       <column type="gchararray"/>
-      <!-- type -->
       <column type="gchararray"/>
-      <!-- label -->
       <column type="gchararray"/>
-      <!-- action -->
       <column type="gchararray"/>
-      <!-- target -->
       <column type="gchararray"/>
-      <!-- icon -->
     </columns>
   </object>
   <template class="GtkInspectorMenu" parent="GtkBox">
diff --git a/gtk/inspector/misc-info.ui b/gtk/inspector/misc-info.ui
index d82b73f272..0ee5082e24 100644
--- a/gtk/inspector/misc-info.ui
+++ b/gtk/inspector/misc-info.ui
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorMiscInfo" parent="GtkScrolledWindow">
-    <property name="expand">0</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
diff --git a/gtk/inspector/object-hierarchy.ui b/gtk/inspector/object-hierarchy.ui
index 9b96c7780a..c4be43048c 100644
--- a/gtk/inspector/object-hierarchy.ui
+++ b/gtk/inspector/object-hierarchy.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
diff --git a/gtk/inspector/object-tree.ui b/gtk/inspector/object-tree.ui
index e56dc8a8d3..ed3ba30397 100644
--- a/gtk/inspector/object-tree.ui
+++ b/gtk/inspector/object-tree.ui
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorObjectTree" parent="GtkBox">
-    <property name="visible">True</property>
     <property name="orientation">vertical</property>
     <signal name="hierarchy-changed" handler="on_hierarchy_changed"/>
     <child>
diff --git a/gtk/inspector/prop-list.ui b/gtk/inspector/prop-list.ui
index 046f25d054..00359d7d30 100644
--- a/gtk/inspector/prop-list.ui
+++ b/gtk/inspector/prop-list.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
diff --git a/gtk/inspector/recorder.ui b/gtk/inspector/recorder.ui
index 2ee6e90d0f..e0f5e74c30 100644
--- a/gtk/inspector/recorder.ui
+++ b/gtk/inspector/recorder.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GListStore" id="recordings"/>
   <template class="GtkInspectorRecorder" parent="GtkBin">
@@ -145,7 +144,7 @@
                     </child>
                     <child>
                       <object class="GtkPicture" id="render_node_view">
-                        <property name="expand">True</property>
+                        <property name="expand">1</property>
                       </object>
                     </child>
                   </object>
diff --git a/gtk/inspector/resource-list.ui b/gtk/inspector/resource-list.ui
index 5d13ce024d..e380a7641e 100644
--- a/gtk/inspector/resource-list.ui
+++ b/gtk/inspector/resource-list.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
@@ -8,231 +7,237 @@
       <column type="guint64"/>
     </columns>
   </object>
-  <object class="GtkTextBuffer" id="buffer">
-  </object>
+  <object class="GtkTextBuffer" id="buffer"/>
   <template class="GtkInspectorResourceList" parent="GtkBox">
-    <property name="orientation">horizontal</property>
     <signal name="hierarchy-changed" handler="on_hierarchy_changed"/>
     <child>
       <object class="GtkStack" id="stack">
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkSearchBar" id="search_bar">
-                <property name="show-close-button">1</property>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="linked"/>
-                    </style>
-                    <child>
-                      <object class="GtkSearchEntry" id="search_entry">
-                        <property name="max-width-chars">40</property>
-                        <signal name="search-changed" handler="on_search_changed"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="icon-name">go-down-symbolic</property>
-                        <signal name="clicked" handler="next_match"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="icon-name">go-up-symbolic</property>
-                        <signal name="clicked" handler="previous_match"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="expand">1</property>
-                <property name="hscrollbar-policy">never</property>
-                <child>
-                  <object class="GtkTreeView" id="tree">
-                    <property name="model">model</property>
-                    <property name="enable-search">0</property>
-                    <property name="enable-grid-lines">vertical</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection">
-                        <signal name="changed" handler="on_selection_changed"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="path_column">
-                        <property name="title" translatable="yes">Path</property>
-                        <property name="resizable">1</property>
-                        <property name="sort-column-id">0</property>
-                        <child>
-                          <object class="GtkCellRendererText">
-                            <property name="scale">0.8</property>
-                            <property name="ellipsize">end</property>
-                            <property name="width-chars">10</property>
-                            <property name="max-width-chars">5</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="count_column">
-                        <property name="title" translatable="yes">Count</property>
-                        <property name="resizable">1</property>
-                        <property name="sort-column-id">1</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="count_renderer">
-                            <property name="scale">0.8</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="size_column">
-                        <property name="title" translatable="yes">Size</property>
-                        <property name="resizable">1</property>
-                        <property name="sort-column-id">2</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="size_renderer">
-                            <property name="scale">0.8</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">list</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkSearchBar" id="search_bar">
+                    <property name="show-close-button">1</property>
+                    <child>
+                      <object class="GtkBox">
+                        <style>
+                          <class name="linked"/>
+                        </style>
+                        <child>
+                          <object class="GtkSearchEntry" id="search_entry">
+                            <property name="max-width-chars">40</property>
+                            <signal name="search-changed" handler="on_search_changed"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton">
+                            <property name="icon-name">go-down-symbolic</property>
+                            <signal name="clicked" handler="next_match"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton">
+                            <property name="icon-name">go-up-symbolic</property>
+                            <signal name="clicked" handler="previous_match"/>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="expand">1</property>
+                    <property name="hscrollbar-policy">never</property>
+                    <child>
+                      <object class="GtkTreeView" id="tree">
+                        <property name="model">model</property>
+                        <property name="enable-search">0</property>
+                        <property name="enable-grid-lines">vertical</property>
+                        <signal name="row-activated" handler="row_activated"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection">
+                            <signal name="changed" handler="on_selection_changed"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="path_column">
+                            <property name="title" translatable="yes">Path</property>
+                            <property name="resizable">1</property>
+                            <property name="sort-column-id">0</property>
+                            <child>
+                              <object class="GtkCellRendererText">
+                                <property name="scale">0.8</property>
+                                <property name="ellipsize">end</property>
+                                <property name="width-chars">10</property>
+                                <property name="max-width-chars">5</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="count_column">
+                            <property name="title" translatable="yes">Count</property>
+                            <property name="resizable">1</property>
+                            <property name="sort-column-id">1</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="count_renderer">
+                                <property name="scale">0.8</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="size_column">
+                            <property name="title" translatable="yes">Size</property>
+                            <property name="resizable">1</property>
+                            <property name="sort-column-id">2</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="size_renderer">
+                                <property name="scale">0.8</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkGrid" id="info_grid">
-                <property name="row-spacing">10</property>
-                <property name="column-spacing">10</property>
-                <property name="margin">10</property>
-                <property name="halign">center</property>
-                <child>
-                  <object class="GtkLabel" id="name">
-                    <property name="label" translatable="yes">Name:</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="name_label">
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                    <property name="selectable">1</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="type">
-                    <property name="label" translatable="yes">Type:</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="type_label">
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Size:</property>
-                    <property name="halign">end</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="size_label">
-                    <property name="halign">start</property>
-                    <property name="valign">baseline</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="content">
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="expand">1</property>
-                    <property name="shadow-type">in</property>
-                    <style>
-                      <class name="view"/>
-                    </style>
-                    <child>
-                      <object class="GtkTextView">
-                        <property name="editable">0</property>
-                        <property name="buffer">buffer</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="name">text</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="expand">1</property>
-                    <property name="shadow-type">in</property>
-                    <style>
-                      <class name="view"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage" id="image">
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="name">image</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">details</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkGrid" id="info_grid">
+                    <property name="row-spacing">10</property>
+                    <property name="column-spacing">10</property>
+                    <property name="margin">10</property>
+                    <property name="halign">center</property>
+                    <child>
+                      <object class="GtkLabel" id="name">
+                        <property name="label" translatable="yes">Name:</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="name_label">
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                        <property name="selectable">1</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="type">
+                        <property name="label" translatable="yes">Type:</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="type_label">
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Size:</property>
+                        <property name="halign">end</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="size_label">
+                        <property name="halign">start</property>
+                        <property name="valign">baseline</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStack" id="content">
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">text</property>
+                        <property name="child">
+                          <object class="GtkScrolledWindow">
+                            <property name="expand">1</property>
+                            <property name="shadow-type">in</property>
+                            <style>
+                              <class name="view"/>
+                            </style>
+                            <child>
+                              <object class="GtkTextView">
+                                <property name="editable">0</property>
+                                <property name="buffer">buffer</property>
+                              </object>
+                            </child>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">image</property>
+                        <property name="child">
+                          <object class="GtkScrolledWindow">
+                            <property name="expand">1</property>
+                            <property name="shadow-type">in</property>
+                            <style>
+                              <class name="view"/>
+                            </style>
+                            <child>
+                              <object class="GtkImage" id="image">
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
       </object>
     </child>
diff --git a/gtk/inspector/selector.ui b/gtk/inspector/selector.ui
index ef3a5e32be..7344067084 100644
--- a/gtk/inspector/selector.ui
+++ b/gtk/inspector/selector.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
diff --git a/gtk/inspector/signals-list.ui b/gtk/inspector/signals-list.ui
index eb4ee5d8ae..b0d13bb434 100644
--- a/gtk/inspector/signals-list.ui
+++ b/gtk/inspector/signals-list.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
diff --git a/gtk/inspector/statistics.ui b/gtk/inspector/statistics.ui
index fd94174b71..e29917950d 100644
--- a/gtk/inspector/statistics.ui
+++ b/gtk/inspector/statistics.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
@@ -13,145 +12,148 @@
     </columns>
   </object>
   <template class="GtkInspectorStatistics" parent="GtkBox">
-    <property name="visible">True</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkStack" id="stack">
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkSearchBar" id="search_bar">
-                <property name="show-close-button">1</property>
-                <child>
-                  <object class="GtkSearchEntry" id="search_entry">
-                    <property name="max-width-chars">40</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="expand">1</property>
-                <property name="vscrollbar-policy">always</property>
-                <child>
-                  <object class="GtkTreeView" id="view">
-                    <property name="model">model</property>
-                    <property name="search-column">1</property>
-                    <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="sort-column-id">1</property>
-                        <property name="title" translatable="yes">Type</property>
-                        <child>
-                          <object class="GtkCellRendererText">
-                            <property name="scale">0.8</property>
-                          </object>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="column_self1">
-                        <property name="sort-column-id">2</property>
-                        <property name="title" translatable="yes">Self 1</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer_self1">
-                            <property name="scale">0.8</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="column_cumulative1">
-                        <property name="sort-column-id">3</property>
-                        <property name="title" translatable="yes">Cumulative 1</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer_cumulative1">
-                            <property name="scale">0.8</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="column_self2">
-                        <property name="sort-column-id">4</property>
-                        <property name="title" translatable="yes">Self 2</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer_self2">
-                            <property name="scale">0.8</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="column_cumulative2">
-                        <property name="sort-column-id">5</property>
-                        <property name="title" translatable="yes">Cumulative 2</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer_cumulative2">
-                            <property name="scale">0.8</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="column_self_graph">
-                        <property name="sort-column-id">4</property>
-                        <property name="title" translatable="yes">Self</property>
-                        <child>
-                          <object class="GtkCellRendererGraph" id="renderer_self_graph">
-                            <property name="minimum">0</property>
-                            <property name="xpad">1</property>
-                            <property name="ypad">1</property>
-                          </object>
-                          <attributes>
-                            <attribute name="data">6</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="column_cumulative_graph">
-                        <property name="sort-column-id">5</property>
-                        <property name="title" translatable="yes">Cumulative</property>
-                        <child>
-                          <object class="GtkCellRendererGraph" id="renderer_cumulative_graph">
-                            <property name="minimum">0</property>
-                            <property name="xpad">1</property>
-                            <property name="ypad">1</property>
-                          </object>
-                          <attributes>
-                            <attribute name="data">7</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">statistics</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkSearchBar" id="search_bar">
+                    <property name="show-close-button">1</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="search_entry">
+                        <property name="max-width-chars">40</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="expand">1</property>
+                    <property name="vscrollbar-policy">always</property>
+                    <child>
+                      <object class="GtkTreeView" id="view">
+                        <property name="model">model</property>
+                        <property name="search-column">1</property>
+                        <child>
+                          <object class="GtkTreeViewColumn">
+                            <property name="sort-column-id">1</property>
+                            <property name="title" translatable="yes">Type</property>
+                            <child>
+                              <object class="GtkCellRendererText">
+                                <property name="scale">0.8</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="column_self1">
+                            <property name="sort-column-id">2</property>
+                            <property name="title" translatable="yes">Self 1</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer_self1">
+                                <property name="scale">0.8</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="column_cumulative1">
+                            <property name="sort-column-id">3</property>
+                            <property name="title" translatable="yes">Cumulative 1</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer_cumulative1">
+                                <property name="scale">0.8</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="column_self2">
+                            <property name="sort-column-id">4</property>
+                            <property name="title" translatable="yes">Self 2</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer_self2">
+                                <property name="scale">0.8</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="column_cumulative2">
+                            <property name="sort-column-id">5</property>
+                            <property name="title" translatable="yes">Cumulative 2</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer_cumulative2">
+                                <property name="scale">0.8</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="column_self_graph">
+                            <property name="sort-column-id">4</property>
+                            <property name="title" translatable="yes">Self</property>
+                            <child>
+                              <object class="GtkCellRendererGraph" id="renderer_self_graph">
+                                <property name="minimum">0</property>
+                                <property name="xpad">1</property>
+                                <property name="ypad">1</property>
+                              </object>
+                              <attributes>
+                                <attribute name="data">6</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="column_cumulative_graph">
+                            <property name="sort-column-id">5</property>
+                            <property name="title" translatable="yes">Cumulative</property>
+                            <child>
+                              <object class="GtkCellRendererGraph" id="renderer_cumulative_graph">
+                                <property name="minimum">0</property>
+                                <property name="xpad">1</property>
+                                <property name="ypad">1</property>
+                              </object>
+                              <attributes>
+                                <attribute name="data">7</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="can-focus">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkLabel" id="excuse">
-                <property name="selectable">1</property>
-                <property name="label" translatable="yes">Enable statistics with GOBJECT_DEBUG=instance-count</property>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">excuse</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="can-focus">1</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <child>
+                  <object class="GtkLabel" id="excuse">
+                    <property name="selectable">1</property>
+                    <property name="label" translatable="yes">Enable statistics with GOBJECT_DEBUG=instance-count</property>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
       </object>
     </child>
diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index 84fb5e7362..1b143fd291 100644
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="scale_adjustment">
     <property name="lower">1</property>
@@ -26,8 +25,6 @@
   </object>
   <template class="GtkInspectorVisual" parent="GtkScrolledWindow">
     <property name="hscrollbar-policy">never</property>
-    <property name="vscrollbar-policy">automatic</property>
-    <property name="expand">0</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
@@ -224,7 +221,7 @@
                             <property name="draw-value">0</property>
                             <property name="hexpand">1</property>
                             <marks>
-                              <mark value="1.0" position="top"></mark>
+                              <mark value="1.0" position="top"/>
                             </marks>
                           </object>
                         </child>
@@ -348,7 +345,7 @@
                             <property name="draw-value">0</property>
                             <property name="hexpand">1</property>
                             <marks>
-                              <mark value="0.0" position="top"></mark>
+                              <mark value="0.0" position="top"/>
                             </marks>
                           </object>
                         </child>
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 8a5d9d7d7f..923f5b9905 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="magnification_adjustment">
     <property name="lower">1.0</property>
@@ -17,135 +16,161 @@
           <object class="GtkStack" id="button_stack">
             <property name="visible-child-name" bind-source="top_stack" bind-property="visible-child-name"/>
             <child>
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkButton" id="select_object">
-                    <property name="focus-on-click">0</property>
-                    <property name="tooltip-text" translatable="yes">Select an Object</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="icon-name">find-location-symbolic</property>
-                    <signal name="clicked" handler="gtk_inspector_on_inspect"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStack" id="object_buttons">
-                    <child>
-                      <object class="GtkButton" id="object_details_button">
-                        <property name="focus-on-click">0</property>
-                        <property name="tooltip-text" translatable="yes">Show Details</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="icon-name">dialog-information-symbolic</property>
-                        <signal name="clicked" handler="open_object_details"/>
-                      </object>
-                      <packing>
-                        <property name="name">list</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="focus-on-click">0</property>
-                        <property name="tooltip-text" translatable="yes">Show all Objects</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="icon-name">view-list-symbolic</property>
-                        <signal name="clicked" handler="close_object_details"/>
-                      </object>
-                      <packing>
-                        <property name="name">details</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">objects</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkStack" id="global_button_stack">
-                <property name="visible-child-name" bind-source="global_stack" bind-property="visible-child-name"/>
-                <child>
-                  <object class="GtkBox"/>
-                  <packing>
-                    <property name="name">general</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox"/>
-                  <packing>
-                    <property name="name">visual</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkStack" id="resource_buttons">
-                    <property name="halign">start</property>
-                    <property name="valign">center</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkButton">
+                      <object class="GtkButton" id="select_object">
                         <property name="focus-on-click">0</property>
-                        <property name="tooltip-text" translatable="yes">Show Details</property>
+                        <property name="tooltip-text" translatable="yes">Select an Object</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
-                        <property name="icon-name">dialog-information-symbolic</property>
+                        <property name="icon-name">find-location-symbolic</property>
+                        <signal name="clicked" handler="gtk_inspector_on_inspect"/>
                       </object>
-                      <packing>
-                        <property name="name">list</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkButton">
-                        <property name="focus-on-click">0</property>
-                        <property name="tooltip-text" translatable="yes">Show all Resources</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="icon-name">view-list-symbolic</property>
+                      <object class="GtkStack" id="object_buttons">
+                        <child>
+                          <object class="GtkStackPage">
+                            <property name="name">list</property>
+                            <property name="child">
+                              <object class="GtkButton" id="object_details_button">
+                                <property name="focus-on-click">0</property>
+                                <property name="tooltip-text" translatable="yes">Show Details</property>
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                                <property name="icon-name">dialog-information-symbolic</property>
+                                <signal name="clicked" handler="open_object_details"/>
+                              </object>
+                            </property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkStackPage">
+                            <property name="name">details</property>
+                            <property name="child">
+                              <object class="GtkButton">
+                                <property name="focus-on-click">0</property>
+                                <property name="tooltip-text" translatable="yes">Show all Objects</property>
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                                <property name="icon-name">view-list-symbolic</property>
+                                <signal name="clicked" handler="close_object_details"/>
+                              </object>
+                            </property>
+                          </object>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="name">details</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="name">resources</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToggleButton" id="record_statistics_button">
-                    <property name="focus-on-click">0</property>
-                    <property name="tooltip-text" translatable="yes">Collect Statistics</property>
-                    <property name="halign">start</property>
-                    <property name="valign">center</property>
-                    <property name="icon-name">media-record-symbolic</property>
-                  </object>
-                  <packing>
-                    <property name="name">statistics</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox"/>
-                  <packing>
-                    <property name="name">logs</property>
-                  </packing>
-                </child>
+                </property>
               </object>
-              <packing>
+            </child>
+            <child>
+              <object class="GtkStackPage">
                 <property name="name">global</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkStack" id="global_button_stack">
+                    <property name="visible-child-name" bind-source="global_stack" bind-property="visible-child-name"/>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">general</property>
+                        <property name="child">
+                          <object class="GtkBox"/>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">visual</property>
+                        <property name="child">
+                          <object class="GtkBox"/>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">resources</property>
+                        <property name="child">
+                          <object class="GtkStack" id="resource_buttons">
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">list</property>
+                                <property name="child">
+                                  <object class="GtkButton">
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="yes">Show Details</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="icon-name">dialog-information-symbolic</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">details</property>
+                                <property name="child">
+                                  <object class="GtkButton">
+                                    <property name="focus-on-click">0</property>
+                                    <property name="tooltip-text" translatable="yes">Show all Resources</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="icon-name">view-list-symbolic</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">statistics</property>
+                        <property name="child">
+                          <object class="GtkToggleButton" id="record_statistics_button">
+                            <property name="focus-on-click">0</property>
+                            <property name="tooltip-text" translatable="yes">Collect Statistics</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="icon-name">media-record-symbolic</property>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">logs</property>
+                        <property name="child">
+                          <object class="GtkBox"/>
+                        </property>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkBox"/>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">css</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkBox"/>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkBox"/>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">recorder</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkBox"/>
+                </property>
+              </object>
             </child>
           </object>
         </child>
@@ -161,310 +186,370 @@
     <child>
       <object class="GtkStack" id="top_stack">
         <child>
-          <object class="GtkStack" id="object_stack">
-            <child>
-              <object class="GtkInspectorObjectTree" id="object_tree">
-                <signal name="object-activated" handler="on_object_activated"/>
-                <signal name="object-selected" handler="on_object_selected"/>
-              </object>
-              <packing>
-                <property name="name">object-tree</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkCenterBox">
-                    <child type="start">
-                      <object class="GtkBox">
-                        <property name="spacing">10</property>
-                        <child>
-                          <object class="GtkStackCombo" id="stackcombo">
-                            <property name="margin">6</property>
-                            <property name="stack">object_details</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkStack" id="object_start_stack">
-                            <child>
-                              <object class="GtkBox"/>
-                              <packing>
-                                <property name="name">empty</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="spacing">6</property>
-                                <property name="margin">6</property>
-                                <child>
-                                  <object class="GtkToggleButton" id="signals_trace_button">
-                                    <property name="relief">none</property>
-                                    <property name="tooltip-text" translatable="yes">Trace signal emissions on this object</property>
-                                    <property name="icon-name">media-record-symbolic</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="signals_clear_button">
-                                    <property name="relief">none</property>
-                                    <property name="tooltip-text" translatable="yes">Clear log</property>
-                                    <property name="icon-name">edit-clear-symbolic</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="name">signals</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScale">
-                                <property name="width-request">150</property>
-                                <property name="draw-value">0</property>
-                                <property name="adjustment">magnification_adjustment</property>
-                                <marks>
-                                  <mark value="1.0" position="bottom"></mark>
-                                  <mark value="2.0" position="bottom"></mark>
-                                  <mark value="3.0" position="bottom"></mark>
-                                  <mark value="4.0" position="bottom"></mark>
-                                  <mark value="5.0" position="bottom"></mark>
-                                </marks>
-                              </object>
-                              <packing>
-                                <property name="name">magnifier</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="center">
-                      <object class="GtkStack" id="object_center_stack">
-                        <property name="transition-type">crossfade</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <child>
-                          <object class="GtkLabel" id="object_title"/>
-                          <packing>
-                            <property name="name">title</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSearchEntry" id="prop_search_entry">
-                            <property name="margin">6</property>
-                            <property name="max-width-chars">40</property>
-                          </object>
-                          <packing>
-                            <property name="name">prop-search</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSearchEntry" id="child_prop_search_entry">
-                            <property name="margin">6</property>
-                            <property name="max-width-chars">40</property>
-                          </object>
-                          <packing>
-                            <property name="name">child-prop-search</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStack" id="object_details">
-                    <signal name="notify::visible-child" handler="object_details_changed"/>
-                    <child>
-                      <object class="GtkInspectorMiscInfo" id="misc_info">
-                        <property name="object-tree">object_tree</property>
-                      </object>
-                      <packing>
-                        <property name="name">misc</property>
-                        <property name="title" translatable="yes">Miscellaneous</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorPropList" id="prop_list">
-                        <property name="child-properties">False</property>
-                        <property name="object-tree">object_tree</property>
-                        <property name="search-entry">prop_search_entry</property>
-                      </object>
-                      <packing>
-                        <property name="name">properties</property>
-                        <property name="title" translatable="yes">Properties</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorSignalsList" id="signals_list">
-                        <property name="trace-button">signals_trace_button</property>
-                        <property name="clear-button">signals_clear_button</property>
-                      </object>
-                      <packing>
-                        <property name="name">signals</property>
-                        <property name="title" translatable="yes">Signals</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorPropList" id="child_prop_list">
-                        <property name="child-properties">True</property>
-                        <property name="object-tree">object_tree</property>
-                        <property name="search-entry">child_prop_search_entry</property>
-                      </object>
-                      <packing>
-                        <property name="name">child-properties</property>
-                        <property name="title" translatable="yes">Child Properties</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorObjectHierarchy" id="object_hierarchy"/>
-                      <packing>
-                        <property name="name">hierarchy</property>
-                        <property name="title" translatable="yes">Class Hierarchy</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorSelector" id="selector"/>
-                      <packing>
-                        <property name="name">selector</property>
-                        <property name="title" translatable="yes">CSS Selector</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorCssNodeTree" id="widget_css_node_tree">
-                        <signal name="notify::node" handler="notify_node"/>
-                      </object>
-                      <packing>
-                        <property name="name">css-nodes</property>
-                        <property name="title" translatable="yes">CSS Nodes</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorSizeGroups" id="size_groups"/>
-                      <packing>
-                        <property name="name">size-groups</property>
-                        <property name="title" translatable="yes">Size Groups</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorDataList" id="data_list"/>
-                      <packing>
-                        <property name="name">data</property>
-                        <property name="title" translatable="yes">Data</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorActions" id="actions"/>
-                      <packing>
-                        <property name="name">actions</property>
-                        <property name="title" translatable="yes">Actions</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorMenu" id="menu"/>
-                      <packing>
-                        <property name="name">menu</property>
-                        <property name="title" translatable="yes">Menu</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorControllers" id="controllers">
-                        <property name="object-tree">object_tree</property>
-                      </object>
-                      <packing>
-                        <property name="name">controllers</property>
-                        <property name="title" translatable="yes">Controllers</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInspectorMagnifier" id="magnifier">
-                        <property name="adjustment">magnification_adjustment</property>
-                      </object>
-                      <packing>
-                        <property name="name">magnifier</property>
-                        <property name="title" translatable="yes">Magnifier</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">object-details</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">objects</property>
             <property name="title" translatable="yes">Objects</property>
-          </packing>
+            <property name="child">
+              <object class="GtkStack" id="object_stack">
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">object-tree</property>
+                    <property name="child">
+                      <object class="GtkInspectorObjectTree" id="object_tree">
+                        <signal name="object-activated" handler="on_object_activated"/>
+                        <signal name="object-selected" handler="on_object_selected"/>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">object-details</property>
+                    <property name="child">
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkCenterBox">
+                            <child type="start">
+                              <object class="GtkBox">
+                                <property name="spacing">10</property>
+                                <child>
+                                  <object class="GtkStackCombo" id="stackcombo">
+                                    <property name="margin">6</property>
+                                    <property name="stack">object_details</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkStack" id="object_start_stack">
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">empty</property>
+                                        <property name="child">
+                                          <object class="GtkBox"/>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">signals</property>
+                                        <property name="child">
+                                          <object class="GtkBox">
+                                            <property name="spacing">6</property>
+                                            <property name="margin">6</property>
+                                            <child>
+                                              <object class="GtkToggleButton" id="signals_trace_button">
+                                                <property name="relief">none</property>
+                                                <property name="tooltip-text" translatable="yes">Trace signal emissions on this object</property>
+                                                <property name="icon-name">media-record-symbolic</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkButton" id="signals_clear_button">
+                                                <property name="relief">none</property>
+                                                <property name="tooltip-text" translatable="yes">Clear log</property>
+                                                <property name="icon-name">edit-clear-symbolic</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkStackPage">
+                                        <property name="name">magnifier</property>
+                                        <property name="child">
+                                          <object class="GtkScale">
+                                            <property name="width-request">150</property>
+                                            <property name="draw-value">0</property>
+                                            <property name="adjustment">magnification_adjustment</property>
+                                            <marks>
+                                              <mark value="1.0" position="bottom"/>
+                                              <mark value="2.0" position="bottom"/>
+                                              <mark value="3.0" position="bottom"/>
+                                              <mark value="4.0" position="bottom"/>
+                                              <mark value="5.0" position="bottom"/>
+                                            </marks>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="center">
+                              <object class="GtkStack" id="object_center_stack">
+                                <property name="transition-type">crossfade</property>
+                                <property name="hexpand">1</property>
+                                <property name="halign">center</property>
+                                <child>
+                                  <object class="GtkStackPage">
+                                    <property name="name">title</property>
+                                    <property name="child">
+                                      <object class="GtkLabel" id="object_title"/>
+                                    </property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkStackPage">
+                                    <property name="name">prop-search</property>
+                                    <property name="child">
+                                      <object class="GtkSearchEntry" id="prop_search_entry">
+                                        <property name="margin">6</property>
+                                        <property name="max-width-chars">40</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkStackPage">
+                                    <property name="name">child-prop-search</property>
+                                    <property name="child">
+                                      <object class="GtkSearchEntry" id="child_prop_search_entry">
+                                        <property name="margin">6</property>
+                                        <property name="max-width-chars">40</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkStack" id="object_details">
+                            <signal name="notify::visible-child" handler="object_details_changed"/>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">misc</property>
+                                <property name="title" translatable="yes">Miscellaneous</property>
+                                <property name="child">
+                                  <object class="GtkInspectorMiscInfo" id="misc_info">
+                                    <property name="object-tree">object_tree</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">properties</property>
+                                <property name="title" translatable="yes">Properties</property>
+                                <property name="child">
+                                  <object class="GtkInspectorPropList" id="prop_list">
+                                    <property name="child-properties">False</property>
+                                    <property name="object-tree">object_tree</property>
+                                    <property name="search-entry">prop_search_entry</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">signals</property>
+                                <property name="title" translatable="yes">Signals</property>
+                                <property name="child">
+                                  <object class="GtkInspectorSignalsList" id="signals_list">
+                                    <property name="trace-button">signals_trace_button</property>
+                                    <property name="clear-button">signals_clear_button</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">child-properties</property>
+                                <property name="title" translatable="yes">Child Properties</property>
+                                <property name="child">
+                                  <object class="GtkInspectorPropList" id="child_prop_list">
+                                    <property name="child-properties">True</property>
+                                    <property name="object-tree">object_tree</property>
+                                    <property name="search-entry">child_prop_search_entry</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">hierarchy</property>
+                                <property name="title" translatable="yes">Class Hierarchy</property>
+                                <property name="child">
+                                  <object class="GtkInspectorObjectHierarchy" id="object_hierarchy"/>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">selector</property>
+                                <property name="title" translatable="yes">CSS Selector</property>
+                                <property name="child">
+                                  <object class="GtkInspectorSelector" id="selector"/>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">css-nodes</property>
+                                <property name="title" translatable="yes">CSS Nodes</property>
+                                <property name="child">
+                                  <object class="GtkInspectorCssNodeTree" id="widget_css_node_tree">
+                                    <signal name="notify::node" handler="notify_node"/>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">size-groups</property>
+                                <property name="title" translatable="yes">Size Groups</property>
+                                <property name="child">
+                                  <object class="GtkInspectorSizeGroups" id="size_groups"/>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">data</property>
+                                <property name="title" translatable="yes">Data</property>
+                                <property name="child">
+                                  <object class="GtkInspectorDataList" id="data_list"/>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">actions</property>
+                                <property name="title" translatable="yes">Actions</property>
+                                <property name="child">
+                                  <object class="GtkInspectorActions" id="actions"/>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">menu</property>
+                                <property name="title" translatable="yes">Menu</property>
+                                <property name="child">
+                                  <object class="GtkInspectorMenu" id="menu"/>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">controllers</property>
+                                <property name="title" translatable="yes">Controllers</property>
+                                <property name="child">
+                                  <object class="GtkInspectorControllers" id="controllers">
+                                    <property name="object-tree">object_tree</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkStackPage">
+                                <property name="name">magnifier</property>
+                                <property name="title" translatable="yes">Magnifier</property>
+                                <property name="child">
+                                  <object class="GtkInspectorMagnifier" id="magnifier">
+                                    <property name="adjustment">magnification_adjustment</property>
+                                  </object>
+                                </property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <child>
-              <object class="GtkStackSidebar">
-                <property name="stack">global_stack</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="global_stack">
-                <child>
-                  <object class="GtkInspectorGeneral"/>
-                  <packing>
-                    <property name="name">general</property>
-                    <property name="title" translatable="yes">General</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkInspectorVisual"/>
-                  <packing>
-                    <property name="name">visual</property>
-                    <property name="title" translatable="yes">Visual</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkInspectorResourceList">
-                    <property name="buttons">resource_buttons</property>
-                  </object>
-                  <packing>
-                    <property name="name">resources</property>
-                    <property name="title" translatable="yes">Resources</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkInspectorStatistics">
-                    <property name="button">record_statistics_button</property>
-                  </object>
-                  <packing>
-                    <property name="name">statistics</property>
-                    <property name="title" translatable="yes">Statistics</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkInspectorLogs"/>
-                  <packing>
-                    <property name="name">logs</property>
-                    <property name="title" translatable="yes">Logging</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">global</property>
             <property name="title" translatable="yes">Global</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <child>
+                  <object class="GtkStackSidebar">
+                    <property name="stack">global_stack</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStack" id="global_stack">
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">general</property>
+                        <property name="title" translatable="yes">General</property>
+                        <property name="child">
+                          <object class="GtkInspectorGeneral"/>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">visual</property>
+                        <property name="title" translatable="yes">Visual</property>
+                        <property name="child">
+                          <object class="GtkInspectorVisual"/>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">resources</property>
+                        <property name="title" translatable="yes">Resources</property>
+                        <property name="child">
+                          <object class="GtkInspectorResourceList">
+                            <property name="buttons">resource_buttons</property>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">statistics</property>
+                        <property name="title" translatable="yes">Statistics</property>
+                        <property name="child">
+                          <object class="GtkInspectorStatistics">
+                            <property name="button">record_statistics_button</property>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">logs</property>
+                        <property name="title" translatable="yes">Logging</property>
+                        <property name="child">
+                          <object class="GtkInspectorLogs"/>
+                        </property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkInspectorCssEditor"/>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">css</property>
             <property name="title" translatable="yes">CSS</property>
-          </packing>
+            <property name="child">
+              <object class="GtkInspectorCssEditor"/>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkInspectorRecorder" id="widget_recorder"/>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">recorder</property>
             <property name="title" translatable="yes">Recorder</property>
-          </packing>
+            <property name="child">
+              <object class="GtkInspectorRecorder" id="widget_recorder"/>
+            </property>
+          </object>
         </child>
       </object>
     </child>
diff --git a/gtk/tools/gtk-builder-tool-enumerate.c b/gtk/tools/gtk-builder-tool-enumerate.c
new file mode 100644
index 0000000000..c2428d918c
--- /dev/null
+++ b/gtk/tools/gtk-builder-tool-enumerate.c
@@ -0,0 +1,74 @@
+/*  Copyright 2015 Red Hat, Inc.
+ *
+ * GTK+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * GLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GTK+; see the file COPYING.  If not,
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Matthias Clasen
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include "gtkbuilderprivate.h"
+
+static const gchar *
+object_get_name (GObject *object)
+{
+  if (GTK_IS_BUILDABLE (object))
+    return gtk_buildable_get_name (GTK_BUILDABLE (object));
+  else
+    return g_object_get_data (object, "gtk-builder-name");
+}
+
+void
+do_enumerate (int *argc, char ***argv)
+{
+  GtkBuilder *builder;
+  GError *error = NULL;
+  gint ret;
+  GSList *list, *l;
+  GObject *object;
+  const gchar *name;
+  const gchar *filename;
+
+  filename = (*argv)[1];
+
+  builder = gtk_builder_new ();
+  ret = gtk_builder_add_from_file (builder, filename, &error);
+
+  if (ret == 0)
+    {
+      g_printerr ("%s\n", error->message);
+      exit (1);
+    }
+
+  list = gtk_builder_get_objects (builder);
+  for (l = list; l; l = l->next)
+    {
+      object = l->data;
+      name = object_get_name (object);
+      if (g_str_has_prefix (name, "___") && g_str_has_suffix (name, "___"))
+        continue;
+
+      g_printf ("%s (%s)\n", name, g_type_name_from_instance ((GTypeInstance*)object));
+    }
+  g_slist_free (list);
+
+  g_object_unref (builder);
+}
diff --git a/gtk/tools/gtk-builder-tool-preview.c b/gtk/tools/gtk-builder-tool-preview.c
new file mode 100644
index 0000000000..cc19251235
--- /dev/null
+++ b/gtk/tools/gtk-builder-tool-preview.c
@@ -0,0 +1,197 @@
+/*  Copyright 2015 Red Hat, Inc.
+ *
+ * GTK+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * GLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GTK+; see the file COPYING.  If not,
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Matthias Clasen
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include "gtkbuilderprivate.h"
+
+static void
+set_window_title (GtkWindow  *window,
+                  const char *filename,
+                  const char *id)
+{
+  gchar *name;
+  gchar *title;
+
+  name = g_path_get_basename (filename);
+
+  if (id)
+    title = g_strdup_printf ("%s in %s", id, name);
+  else
+    title = g_strdup (name);
+
+  gtk_window_set_title (window, title);
+
+  g_free (title);
+  g_free (name);
+}
+
+static void
+preview_file (const char *filename,
+              const char *id,
+              const char *cssfile)
+{
+  GtkBuilder *builder;
+  GError *error = NULL;
+  GObject *object;
+  GtkWidget *window;
+
+  if (cssfile)
+    {
+      GtkCssProvider *provider;
+
+      provider = gtk_css_provider_new ();
+      gtk_css_provider_load_from_path (provider, cssfile);
+
+      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                                  GTK_STYLE_PROVIDER (provider),
+                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+  builder = gtk_builder_new ();
+  if (!gtk_builder_add_from_file (builder, filename, &error))
+    {
+      g_printerr ("%s\n", error->message);
+      exit (1);
+    }
+
+  object = NULL;
+
+  if (id)
+    {
+      object = gtk_builder_get_object (builder, id);
+    }
+  else
+    {
+      GSList *objects, *l;
+
+      objects = gtk_builder_get_objects (builder);
+      for (l = objects; l; l = l->next)
+        {
+          GObject *obj = l->data;
+
+          if (GTK_IS_WINDOW (obj))
+            {
+              object = obj;
+              break;
+            }
+          else if (GTK_IS_WIDGET (obj))
+            {
+              if (object == NULL)
+                object = obj;
+            }
+        }
+      g_slist_free (objects);
+    }
+
+  if (object == NULL)
+    {
+      if (id)
+        g_printerr ("No object with ID '%s' found\n", id);
+      else
+        g_printerr ("No previewable object found\n");
+      exit (1);
+    }
+
+  if (!GTK_IS_WIDGET (object))
+    {
+      g_printerr ("Objects of type %s can't be previewed\n", G_OBJECT_TYPE_NAME (object));
+      exit (1);
+    }
+
+  if (GTK_IS_WINDOW (object))
+    window = GTK_WIDGET (object);
+  else
+    {
+      GtkWidget *widget = GTK_WIDGET (object);
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+      if (GTK_IS_BUILDABLE (object))
+        id = gtk_buildable_get_name (GTK_BUILDABLE (object));
+
+      set_window_title (GTK_WINDOW (window), filename, id);
+
+      g_object_ref (widget);
+      if (gtk_widget_get_parent (widget) != NULL)
+        gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);
+      gtk_container_add (GTK_CONTAINER (window), widget);
+      g_object_unref (widget);
+    }
+
+  gtk_window_present (GTK_WINDOW (window));
+
+  gtk_main ();
+
+  g_object_unref (builder);
+}
+
+void
+do_preview (int          *argc,
+            const char ***argv)
+{
+  GOptionContext *context;
+  char *id = NULL;
+  char *css = NULL;
+  char **filenames = NULL;
+  const GOptionEntry entries[] = {
+    { "id", 0, 0, G_OPTION_ARG_STRING, &id, NULL, NULL },
+    { "css", 0, 0, G_OPTION_ARG_FILENAME, &css, NULL, NULL },
+    { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, NULL },
+    { NULL, }
+  };
+  GError *error = NULL;
+
+  context = g_option_context_new (NULL);
+  g_option_context_set_help_enabled (context, FALSE);
+  g_option_context_add_main_entries (context, entries, NULL);
+
+  if (!g_option_context_parse (context, argc, (char ***)argv, &error))
+    {
+      g_printerr ("%s\n", error->message);
+      g_error_free (error);
+      exit (1);
+    }
+
+  g_option_context_free (context);
+
+  if (filenames == NULL)
+    {
+      g_printerr ("No .ui file specified\n");
+      exit (1);
+    }
+
+  if (g_strv_length (filenames) > 1)
+    {
+      g_printerr ("Can only preview a single .ui file\n");
+      exit (1);
+    }
+
+  preview_file (filenames[0], id, css);
+
+  g_strfreev (filenames);
+  g_free (id);
+  g_free (css);
+}
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
new file mode 100644
index 0000000000..759f7c5884
--- /dev/null
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -0,0 +1,872 @@
+/*  Copyright 2015 Red Hat, Inc.
+ *
+ * GTK+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * GLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GTK+; see the file COPYING.  If not,
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Matthias Clasen
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include "gtkbuilderprivate.h"
+
+typedef struct Element Element;
+struct Element {
+  Element *parent;
+  char *element_name;
+  char **attribute_names;
+  char **attribute_values;
+  char *data;
+  GList *children;
+};
+
+static void
+free_element (gpointer data)
+{
+  Element *element = data;
+  g_list_free_full (element->children, free_element);
+  g_free (element->element_name);
+  g_strfreev (element->attribute_names);
+  g_strfreev (element->attribute_values);
+  g_free (element->data);
+  g_free (element);
+}
+
+typedef struct {
+  Element *root;
+  Element *current;
+  GString *value;
+  GtkBuilder *builder;
+  const char *input_filename;
+  char *output_filename;
+  FILE *output;
+  gboolean convert3to4;
+} MyParserData;
+
+static void
+start_element (GMarkupParseContext  *context,
+               const char           *element_name,
+               const char          **attribute_names,
+               const char          **attribute_values,
+               gpointer              user_data,
+               GError              **error)
+{
+  MyParserData *data = user_data;
+  Element *elt;
+
+  elt = g_new0 (Element, 1);
+  elt->parent = data->current;
+  elt->element_name = g_strdup (element_name);
+  elt->attribute_names = g_strdupv ((char **)attribute_names);
+  elt->attribute_values = g_strdupv ((char **)attribute_values);
+
+  if (data->current)
+    data->current->children = g_list_append (data->current->children, elt);
+  data->current = elt;
+
+  if (data->root == NULL)
+    data->root = elt;
+
+  g_string_truncate (data->value, 0);
+}
+
+static void
+end_element (GMarkupParseContext  *context,
+             const char           *element_name,
+             gpointer              user_data,
+             GError              **error)
+{
+  MyParserData *data = user_data;
+
+  data->current->data = g_strdup (data->value->str);
+
+  data->current = data->current->parent;
+}
+
+static void
+text (GMarkupParseContext  *context,
+      const char           *text,
+      gsize                 text_len,
+      gpointer              user_data,
+      GError              **error)
+{
+  MyParserData *data = user_data;
+
+  if (data->value)
+    {
+      g_string_append_len (data->value, text, text_len);
+      return;
+    }
+}
+
+static GMarkupParser parser = {
+  start_element,
+  end_element,
+  text,
+  NULL,
+  NULL
+};
+
+static const gchar *
+canonical_boolean_value (MyParserData *data,
+                         const gchar  *string)
+{
+  GValue value = G_VALUE_INIT;
+  gboolean b = FALSE;
+
+  if (gtk_builder_value_from_string_type (data->builder, G_TYPE_BOOLEAN, string, &value, NULL))
+    b = g_value_get_boolean (&value);
+
+  return b ? "1" : "0";
+}
+
+/* A number of properties unfortunately can't be omitted even
+ * if they are nominally set to their default value. In many
+ * cases, this is due to subclasses not overriding the default
+ * value from the superclass.
+ */
+static gboolean
+needs_explicit_setting (const gchar  *class_name,
+                        const gchar  *property_name,
+                        gboolean      packing)
+{
+  struct _Prop {
+    const char *class;
+    const char *property;
+    gboolean packing;
+  } props[] = {
+    { "GtkAboutDialog", "program-name", 0 },
+    { "GtkCalendar", "year", 0 },
+    { "GtkCalendar", "month", 0 },
+    { "GtkCalendar", "day", 0 },
+    { "GtkPlacesSidebar", "show-desktop", 0 },
+    { "GtkRadioButton", "draw-indicator", 0 },
+    { "GtkGrid", "left-attach", 1 },
+    { "GtkGrid", "top-attach", 1 },
+    { "GtkWidget", "hexpand", 0 },
+    { "GtkWidget", "vexpand", 0 },
+  };
+  gchar *canonical_name;
+  gboolean found;
+  gint k;
+
+  canonical_name = g_strdup (property_name);
+  g_strdelimit (canonical_name, "_", '-');
+
+  found = FALSE;
+  for (k = 0; k < G_N_ELEMENTS (props); k++)
+    {
+      if (strcmp (class_name, props[k].class) == 0 &&
+          strcmp (canonical_name, props[k].property) == 0 &&
+          packing == props[k].packing)
+        {
+          found = TRUE;
+          break;
+        }
+    }
+
+  g_free (canonical_name);
+
+  return found;
+}
+
+static gboolean
+is_pcdata_element (Element *element)
+{
+  /* elements that can contain text */
+  const char *names[] = {
+    "property",
+    "attribute",
+    "action-widget",
+    "pattern",
+    "mime-type",
+    "col",
+    "item",
+    NULL,
+  };
+
+  if (g_str_equal (element->element_name, "property") &&
+      (g_strv_contains ((const char * const *)element->attribute_names, "bind-source") ||
+       g_strv_contains ((const char * const *)element->attribute_names, "bind_source")))
+    return FALSE;
+
+  if (g_strv_contains (names, element->element_name))
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+is_container_element (Element *element)
+{
+  /* elements that just hold a list of things and
+   * can be omitted when they have no children
+   */
+  const char *names[] = {
+    "packing",
+    "cell-packing",
+    "attributes",
+    "action-widgets",
+    "patterns",
+    "mime-types",
+    "attributes",
+    "row",
+    "items",
+    NULL
+  };
+
+  if (g_strv_contains (names, element->element_name))
+    return TRUE;
+
+  return FALSE;
+}
+
+static void
+canonicalize_key (gchar *key)
+{
+  gchar *p;
+
+  for (p = key; *p != 0; p++)
+    {
+      gchar c = *p;
+
+      /* We may meet something like AtkObject::accessible-name */
+      if (c == ':' && ((p > key && p[-1] == ':') || p[1] == ':'))
+        continue;
+
+      if (c != '-' &&
+          (c < '0' || c > '9') &&
+          (c < 'A' || c > 'Z') &&
+          (c < 'a' || c > 'z'))
+        *p = '-';
+    }
+}
+
+static GParamSpec *
+get_property_pspec (MyParserData *data,
+                    const gchar  *class_name,
+                    const gchar  *property_name,
+                    gboolean      packing,
+                    gboolean      cell_packing)
+{
+  GType type;
+  GObjectClass *class;
+  GParamSpec *pspec;
+  gchar *canonical_name;
+
+  type = g_type_from_name (class_name);
+  if (type == G_TYPE_INVALID)
+    {
+      type = gtk_builder_get_type_from_name (data->builder, class_name);
+      if (type == G_TYPE_INVALID)
+        return NULL;
+    }
+
+  class = g_type_class_ref (type);
+  canonical_name = g_strdup (property_name);
+  canonicalize_key (canonical_name);
+  if (packing)
+    pspec = gtk_container_class_find_child_property (class, canonical_name);
+  else if (cell_packing)
+    {
+      GObjectClass *cell_class;
+
+      /* We're just assuming that the cell layout is using a GtkCellAreaBox. */
+      cell_class = g_type_class_ref (GTK_TYPE_CELL_AREA_BOX);
+      pspec = gtk_cell_area_class_find_cell_property (GTK_CELL_AREA_CLASS (cell_class), canonical_name);
+      g_type_class_unref (cell_class);
+    }
+  else
+    pspec = g_object_class_find_property (class, canonical_name);
+  g_free (canonical_name);
+  g_type_class_unref (class);
+
+  return pspec;
+}
+
+static gboolean
+value_is_default (MyParserData *data,
+                  const gchar  *class_name,
+                  const gchar  *property_name,
+                  const gchar  *value_string,
+                  gboolean      packing,
+                  gboolean      cell_packing)
+{
+  GValue value = { 0, };
+  gboolean ret;
+  GError *error = NULL;
+  GParamSpec *pspec;
+
+  pspec = get_property_pspec (data, class_name, property_name, packing, cell_packing);
+
+  if (pspec == NULL)
+    {
+      if (packing)
+        g_printerr (_("%s: Packing property %s::%s not found\n"), data->input_filename, class_name, property_name);
+      else if (cell_packing)
+        g_printerr (_("%s: Cell property %s::%s not found\n"), data->input_filename, class_name, property_name);
+      else
+        g_printerr (_("%s: Property %s::%s not found\n"), data->input_filename, class_name, property_name);
+      return FALSE;
+    }
+  else if (g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (pspec), G_TYPE_OBJECT))
+    return FALSE;
+
+  if (!gtk_builder_value_from_string (data->builder, pspec, value_string, &value, &error))
+    {
+      g_printerr (_("%s: Couldn’t parse value for %s::%s: %s\n"), data->input_filename, class_name, property_name, error->message);
+      g_error_free (error);
+      ret = FALSE;
+    }
+  else
+    ret = g_param_value_defaults (pspec, &value);
+
+  g_value_reset (&value);
+
+  return ret;
+}
+
+static const char *
+get_class_name (Element *element)
+{
+  Element *parent = element->parent;
+  int i;
+
+  if (g_str_equal (element->element_name, "object"))
+    parent = element;
+
+  if (g_str_equal (parent->element_name, "packing"))
+    parent = parent->parent->parent; /* child - object */
+
+  if (g_str_equal (parent->element_name, "object"))
+    {
+      for (i = 0; parent->attribute_names[i]; i++)
+        {
+          if (g_str_equal (parent->attribute_names[i], "class"))
+            return parent->attribute_values[i];
+        }
+    }
+  else if (g_str_equal (parent->element_name, "template"))
+    {
+      for (i = 0; parent->attribute_names[i]; i++)
+        {
+          if (g_str_equal (parent->attribute_names[i], "parent"))
+            return parent->attribute_values[i];
+        }
+    }
+
+  return NULL;
+}
+
+static gboolean
+property_is_boolean (Element      *element,
+                     MyParserData *data)
+{
+  GParamSpec *pspec;
+  gboolean packing = FALSE;
+  const char *class_name;
+  const char *property_name;
+  int i;
+
+  if (g_str_equal (element->parent->element_name, "packing"))
+    packing = TRUE;
+
+  class_name = get_class_name (element);
+  property_name = "";
+
+  for (i = 0; element->attribute_names[i]; i++)
+    {
+      if (strcmp (element->attribute_names[i], "name") == 0)
+        property_name = (const gchar *)element->attribute_values[i];
+    }
+
+  pspec = get_property_pspec (data, class_name, property_name, packing, FALSE);
+  if (pspec)
+    return G_PARAM_SPEC_VALUE_TYPE (pspec) == G_TYPE_BOOLEAN;
+
+  return FALSE;
+}
+
+static gboolean
+property_can_be_omitted (Element      *element,
+                         MyParserData *data)
+{
+  gint i;
+  gboolean bound;
+  gboolean translatable;
+  const gchar *class_name;
+  const gchar *property_name;
+  const gchar *value_string;
+  gboolean packing = FALSE;
+  gboolean cell_packing = FALSE;
+
+  if (g_str_equal (element->parent->element_name, "packing"))
+    packing = TRUE;
+  if (g_str_equal (element->parent->element_name, "cell-packing"))
+    cell_packing = TRUE;
+
+  class_name = get_class_name (element);
+  property_name = "";
+  value_string = element->data;
+
+  bound = FALSE;
+  translatable = FALSE;
+  for (i = 0; element->attribute_names[i]; i++)
+    {
+      if (strcmp (element->attribute_names[i], "bind-source") == 0 ||
+          strcmp (element->attribute_names[i], "bind_source") == 0)
+        bound = TRUE;
+      else if (strcmp (element->attribute_names[i], "translatable") == 0)
+        translatable = TRUE;
+      else if (strcmp (element->attribute_names[i], "name") == 0)
+        property_name = (const gchar *)element->attribute_values[i];
+    }
+
+  if (translatable)
+    return FALSE;
+
+  if (bound)
+    return FALSE;
+
+  if (needs_explicit_setting (class_name, property_name, packing))
+    return FALSE;
+
+  return value_is_default (data, class_name, property_name, value_string, packing, cell_packing);
+}
+
+static gboolean
+property_has_been_removed (Element      *element,
+                           MyParserData *data)
+{
+  const gchar *class_name;
+  const gchar *property_name;
+  gboolean packing = FALSE;
+  struct _Prop {
+    const char *class;
+    const char *property;
+    gboolean packing;
+  } props[] = {
+    { "GtkActionBar", "position", 1 },
+    { "GtkButtonBox", "secondary", 1 },
+    { "GtkButtonBox", "non-homogeneous", 1 },
+    { "GtkBox", "pack-type", 1 },
+    { "GtkBox", "position", 1 },
+    { "GtkHeaderBar", "position", 1 },
+    { "GtkPopoverMenu", "position", 1 },
+    { "GtkMenu", "left-attach", 1 },
+    { "GtkMenu", "right-attach", 1 },
+    { "GtkMenu", "top-attach", 1 },
+    { "GtkMenu", "bottom-attach", 1 }
+  };
+  gchar *canonical_name;
+  gboolean found;
+  gint i, k;
+
+  if (g_str_equal (element->parent->element_name, "packing"))
+    packing = TRUE;
+
+  class_name = get_class_name (element);
+  property_name = "";
+
+  for (i = 0; element->attribute_names[i]; i++)
+    {
+      if (strcmp (element->attribute_names[i], "name") == 0)
+        property_name = (const gchar *)element->attribute_values[i];
+    }
+
+  canonical_name = g_strdup (property_name);
+  g_strdelimit (canonical_name, "_", '-');
+
+  found = FALSE;
+  for (k = 0; k < G_N_ELEMENTS (props); k++)
+    {
+      if (strcmp (class_name, props[k].class) == 0 &&
+          strcmp (canonical_name, props[k].property) == 0 &&
+          packing == props[k].packing)
+        {
+          found = TRUE;
+          break;
+        }
+    }
+
+  g_free (canonical_name);
+
+  return found;
+}
+
+static Element *
+rewrite_stack_child (Element *child, MyParserData *data)
+{
+  Element *object = NULL;
+  Element *packing = NULL;
+  Element *new_object;
+  Element *prop;
+  GList *l;
+
+  if (!g_str_equal (child->element_name, "child"))
+    return child;
+
+  for (l = child->children; l; l = l->next)
+    {
+      Element *elt = l->data;
+      if (g_str_equal (elt->element_name, "object"))
+        object = elt;
+      else if (g_str_equal (elt->element_name, "packing"))
+        packing = elt;
+    }
+
+  if (!packing)
+    return child;
+
+  new_object = g_new0 (Element, 1);
+  new_object->element_name = g_strdup ("object");
+  new_object->attribute_names = g_new0 (char *, 2);
+  new_object->attribute_names[0] = g_strdup ("class");
+  new_object->attribute_values = g_new0 (char *, 2);
+  new_object->attribute_values[0] = g_strdup ("GtkStackPage");
+  new_object->children = packing->children;
+  packing->children = NULL;
+
+  prop = g_new0 (Element, 1);
+  prop->element_name = g_strdup ("property");
+  prop->attribute_names = g_new0 (char *, 2);
+  prop->attribute_names[0] = g_strdup ("name");
+  prop->attribute_values = g_new0 (char *, 2);
+  prop->attribute_values[0] = g_strdup ("child");
+  prop->children = g_list_append (prop->children, object);
+  new_object->children = g_list_append (new_object->children, prop);
+      
+  g_list_free (child->children);
+  child->children = g_list_append (NULL, new_object);
+
+  return child;
+}
+
+static void
+rewrite_stack (Element      *element,
+               MyParserData *data)
+{
+  GList *l, *new_children;
+
+  new_children = NULL;
+  for (l = element->children; l; l = l->next)
+    {
+      Element *child = l->data;
+      new_children = g_list_append (new_children, rewrite_stack_child (child, data));
+    }
+
+  g_list_free (element->children);
+  element->children = new_children;
+}
+
+static Element *
+rewrite_assistant_child (Element *child, MyParserData *data)
+{
+  Element *object = NULL;
+  Element *packing = NULL;
+  Element *new_object;
+  Element *prop;
+  GList *l;
+
+  if (!g_str_equal (child->element_name, "child"))
+    return child;
+
+  for (l = child->children; l; l = l->next)
+    {
+      Element *elt = l->data;
+      if (g_str_equal (elt->element_name, "object"))
+        object = elt;
+      else if (g_str_equal (elt->element_name, "packing"))
+        packing = elt;
+    }
+
+  if (!packing)
+    return child;
+
+  new_object = g_new0 (Element, 1);
+  new_object->element_name = g_strdup ("object");
+  new_object->attribute_names = g_new0 (char *, 2);
+  new_object->attribute_names[0] = g_strdup ("class");
+  new_object->attribute_values = g_new0 (char *, 2);
+  new_object->attribute_values[0] = g_strdup ("GtkAssistantPage");
+  new_object->children = packing->children;
+  packing->children = NULL;
+
+  prop = g_new0 (Element, 1);
+  prop->element_name = g_strdup ("property");
+  prop->attribute_names = g_new0 (char *, 2);
+  prop->attribute_names[0] = g_strdup ("name");
+  prop->attribute_values = g_new0 (char *, 2);
+  prop->attribute_values[0] = g_strdup ("child");
+  prop->children = g_list_append (prop->children, object);
+  new_object->children = g_list_append (new_object->children, prop);
+      
+  g_list_free (child->children);
+  child->children = g_list_append (NULL, new_object);
+
+  return child;
+}
+
+static void
+rewrite_assistant (Element      *element,
+                   MyParserData *data)
+{
+  GList *l, *new_children;
+
+  new_children = NULL;
+  for (l = element->children; l; l = l->next)
+    {
+      Element *child = l->data;
+      new_children = g_list_append (new_children, rewrite_assistant_child (child, data));
+    }
+
+  g_list_free (element->children);
+  element->children = new_children;
+}
+
+static gboolean
+simplify_element (Element      *element,
+                  MyParserData *data)
+{
+  GList *l;
+
+  if (!is_pcdata_element (element))
+    g_clear_pointer (&element->data, g_free);
+  else if (g_str_equal (element->element_name, "property") &&
+           property_is_boolean (element, data))
+    {
+      const char *b = canonical_boolean_value (data, element->data);
+      g_free (element->data);
+      element->data = g_strdup (b);
+    }
+
+  l = element->children;
+  while (l)
+    {
+      GList *next = l->next;
+      Element *child = l->data;
+      if (simplify_element (child, data))
+        {
+          element->children = g_list_remove (element->children, child);
+          free_element (child);
+        }
+      l = next;
+    }
+
+  if (is_container_element (element) && element->children == NULL)
+    return TRUE;
+
+  if (g_str_equal (element->element_name, "property") &&
+      property_can_be_omitted (element, data))
+    return TRUE;
+
+  if (data->convert3to4)
+    {
+      if (g_str_equal (element->element_name, "object") &&
+          g_str_equal (get_class_name (element), "GtkStack"))
+        rewrite_stack (element, data);
+
+      if (g_str_equal (element->element_name, "object") &&
+          g_str_equal (get_class_name (element), "GtkAssistant"))
+        rewrite_assistant (element, data);
+          
+      if (g_str_equal (element->element_name, "property") &&
+          property_has_been_removed (element, data))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+simplify_tree (MyParserData *data)
+{
+  simplify_element (data->root, data);
+}
+
+static void
+dump_element (Element *element,
+              FILE    *output,
+              int      indent)
+{
+  g_fprintf (output, "%*s<%s", indent, "", element->element_name);
+  if (element->attribute_names[0])
+    {
+      int i;
+      for (i = 0; element->attribute_names[i]; i++)
+        {
+          char *escaped = g_markup_escape_text (element->attribute_values[i], -1);
+          g_fprintf (output, " %s=\"%s\"", element->attribute_names[i], escaped);
+          g_free (escaped);
+        }
+    }
+  if (element->children || element->data)
+    {
+      g_fprintf (output, ">");
+
+      if (element->children)
+        {
+          GList *l;
+
+          g_fprintf (output, "\n");
+          for (l = element->children; l; l = l->next)
+            {
+              Element *child = l->data;
+              dump_element (child, output, indent + 2);
+            }
+          g_fprintf (output, "%*s", indent, "");
+        }
+      else
+        {
+          char *escaped = g_markup_escape_text (element->data, -1);
+          g_fprintf (output, "%s", escaped);
+          g_free (escaped);
+        }
+      g_fprintf (output, "</%s>\n", element->element_name);
+    }
+  else
+    g_fprintf (output, "/>\n"); 
+}
+
+static void
+dump_tree (MyParserData *data)
+{
+  dump_element (data->root, data->output, 0);
+}
+
+gboolean
+simplify_file (const char *filename,
+               gboolean    replace,
+               gboolean    convert3to4)
+{
+  GMarkupParseContext *context;
+  gchar *buffer;
+  MyParserData data;
+  GError *error = NULL;
+
+  data.input_filename = filename;
+  data.output_filename = NULL;
+  data.convert3to4 = convert3to4;
+
+  if (replace)
+    {
+      int fd;
+      fd = g_file_open_tmp ("gtk-builder-tool-XXXXXX", &data.output_filename, NULL);
+      data.output = fdopen (fd, "w");
+    }
+  else
+    {
+      data.output = stdout;
+    }
+
+  if (!g_file_get_contents (filename, &buffer, NULL, &error))
+    {
+      g_printerr (_("Can’t load '%s': %s\n"), filename, error->message);
+      return FALSE;
+    }
+
+  data.root = NULL;
+  data.current = NULL;
+  data.value = g_string_new ("");
+
+  context = g_markup_parse_context_new (&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, &data, NULL);
+  if (!g_markup_parse_context_parse (context, buffer, -1, &error))
+    {
+      g_printerr (_("Can’t parse '%s': %s\n"), filename, error->message);
+      return FALSE;
+    }
+
+  data.builder = gtk_builder_new ();
+
+  simplify_tree (&data);
+
+  dump_tree (&data);
+
+  fclose (data.output);
+
+  if (data.output_filename)
+    {
+      char *content;
+      gsize length;
+
+      if (!g_file_get_contents (data.output_filename, &content, &length, &error))
+        {
+          g_printerr (_("Failed to read '%s': %s\n"), data.output_filename, error->message);
+          return FALSE;
+        }
+
+      if (!g_file_set_contents (data.input_filename, content, length, &error))
+        {
+          g_printerr (_("Failed to write %s: '%s'\n"), data.input_filename, error->message);
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+void
+do_simplify (int          *argc,
+             const char ***argv)
+{
+  gboolean replace = FALSE;
+  gboolean convert3to4 = FALSE;
+  char **filenames = NULL;
+  GOptionContext *ctx;
+  const GOptionEntry entries[] = {
+    { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, NULL, NULL },
+    { "3to4", 0, 0, G_OPTION_ARG_NONE, &convert3to4, NULL, NULL },
+    { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, NULL },
+    { NULL, }
+  };
+  GError *error = NULL;
+  int i;
+
+  ctx = g_option_context_new (NULL);
+  g_option_context_set_help_enabled (ctx, FALSE);
+  g_option_context_add_main_entries (ctx, entries, NULL);
+
+  if (!g_option_context_parse (ctx, argc, (char ***)argv, &error))
+    {
+      g_printerr ("%s\n", error->message);
+      g_error_free (error);
+      exit (1);
+    }
+
+  g_option_context_free (ctx);
+
+  if (filenames == NULL)
+    {
+      g_printerr (_("No .ui file specified\n"));
+      exit (1);
+    }
+
+  if (g_strv_length (filenames) > 1 && !replace)
+    {
+      g_printerr (_("Can only simplify a single .ui file without --replace\n"));
+      exit (1);
+    }
+
+  for (i = 0; filenames[i]; i++)
+    {
+      if (!simplify_file (filenames[i], replace, convert3to4))
+        exit (1);
+    }
+}
diff --git a/gtk/tools/gtk-builder-tool-validate.c b/gtk/tools/gtk-builder-tool-validate.c
new file mode 100644
index 0000000000..a64bb2d3e1
--- /dev/null
+++ b/gtk/tools/gtk-builder-tool-validate.c
@@ -0,0 +1,164 @@
+/*  Copyright 2015 Red Hat, Inc.
+ *
+ * GTK+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * GLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GTK+; see the file COPYING.  If not,
+ * see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Matthias Clasen
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include "gtkbuilderprivate.h"
+
+static GType
+make_fake_type (const gchar *type_name,
+                const gchar *parent_name)
+{
+  GType parent_type;
+  GTypeQuery query;
+
+  parent_type = g_type_from_name (parent_name);
+  if (parent_type == G_TYPE_INVALID)
+    {
+      g_printerr ("Failed to lookup template parent type %s\n", parent_name);
+      exit (1);
+    }
+
+  g_type_query (parent_type, &query);
+  return g_type_register_static_simple (parent_type,
+                                        type_name,
+                                        query.class_size,
+                                        NULL,
+                                        query.instance_size,
+                                        NULL,
+                                        0);
+}
+
+static void
+do_validate_template (const gchar *filename,
+                      const gchar *type_name,
+                      const gchar *parent_name)
+{
+  GType template_type;
+  GtkWidget *widget;
+  GtkBuilder *builder;
+  GError *error = NULL;
+  gint ret;
+
+  /* Only make a fake type if it doesn't exist yet.
+   * This lets us e.g. validate the GtkFileChooserWidget template.
+   */
+  template_type = g_type_from_name (type_name);
+  if (template_type == G_TYPE_INVALID)
+    template_type = make_fake_type (type_name, parent_name);
+
+  widget = g_object_new (template_type, NULL);
+  if (!widget)
+    {
+      g_printerr ("Failed to create an instance of the template type %s\n", type_name);
+      exit (1);
+    }
+
+  builder = gtk_builder_new ();
+  ret = gtk_builder_extend_with_template (builder, widget, template_type, " ", 1, &error);
+  if (ret)
+    ret = gtk_builder_add_from_file (builder, filename, &error);
+  g_object_unref (builder);
+
+  if (ret == 0)
+    {
+      g_printerr ("%s\n", error->message);
+      exit (1);
+    }
+}
+
+static gboolean
+parse_template_error (const gchar  *message,
+                      gchar       **class_name,
+                      gchar       **parent_name)
+{
+  gchar *p;
+
+  if (!strstr (message, "Not expecting to handle a template"))
+    return FALSE;
+
+  p = strstr (message, "(class '");
+  if (p)
+    {
+      *class_name = g_strdup (p + strlen ("(class '"));
+      p = strstr (*class_name, "'");
+      if (p)
+        *p = '\0';
+    }
+  p = strstr (message, ", parent '");
+  if (p)
+    {
+      *parent_name = g_strdup (p + strlen (", parent '"));
+      p = strstr (*parent_name, "'");
+      if (p)
+        *p = '\0';
+    }
+
+  return TRUE;
+}
+
+static gboolean
+validate_file (const char *filename)
+{
+  GtkBuilder *builder;
+  GError *error = NULL;
+  gint ret;
+  gchar *class_name = NULL;
+  gchar *parent_name = NULL;
+
+  builder = gtk_builder_new ();
+  ret = gtk_builder_add_from_file (builder, filename, &error);
+  g_object_unref (builder);
+
+  if (ret == 0)
+    {
+      if (g_error_matches (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_UNHANDLED_TAG)  &&
+          parse_template_error (error->message, &class_name, &parent_name))
+        {
+          do_validate_template (filename, class_name, parent_name);
+        }
+      else
+        {
+          g_printerr ("%s: %s\n", filename, error->message);
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+void
+do_validate (int *argc, char ***argv)
+{
+  int i;
+
+  for (i = 1; i < *argc; i++)
+    {
+      if (!validate_file ((*argv)[i]))
+        exit (1);
+    }
+
+  return;
+}
diff --git a/gtk/tools/gtk-builder-tool.c b/gtk/tools/gtk-builder-tool.c
index ebd965ec12..3219baa983 100644
--- a/gtk/tools/gtk-builder-tool.c
+++ b/gtk/tools/gtk-builder-tool.c
@@ -27,1026 +27,10 @@
 #include <gtk/gtk.h>
 #include "gtkbuilderprivate.h"
 
-
-typedef struct {
-  GtkBuilder *builder;
-  GList *classes;
-  gboolean packing;
-  gboolean packing_started;
-  gboolean cell_packing;
-  gboolean cell_packing_started;
-  gint in_child;
-  gint child_started;
-  gchar **attribute_names;
-  gchar **attribute_values;
-  GString *value;
-  gboolean unclosed_starttag;
-  gint indent;
-  char *input_filename;
-  char *output_filename;
-  FILE *output;
-} MyParserData;
-
-static void
-canonicalize_key (gchar *key)
-{
-  gchar *p;
-
-  for (p = key; *p != 0; p++)
-    {
-      gchar c = *p;
-
-      /* We may meet something like AtkObject::accessible-name */
-      if (c == ':' && ((p > key && p[-1] == ':') || p[1] == ':'))
-        continue;
-
-      if (c != '-' &&
-          (c < '0' || c > '9') &&
-          (c < 'A' || c > 'Z') &&
-          (c < 'a' || c > 'z'))
-        *p = '-';
-    }
-}
-
-static GParamSpec *
-get_property_pspec (MyParserData *data,
-                    const gchar  *class_name,
-                    const gchar  *property_name)
-{
-  GType type;
-  GObjectClass *class;
-  GParamSpec *pspec;
-  gchar *canonical_name;
-
-  type = g_type_from_name (class_name);
-  if (type == G_TYPE_INVALID)
-    {
-      GtkBuilder *builder = gtk_builder_new ();
-      type = gtk_builder_get_type_from_name (builder, class_name);
-      g_object_unref (builder);
-      if (type == G_TYPE_INVALID)
-        return NULL;
-    }
-
-  class = g_type_class_ref (type);
-  canonical_name = g_strdup (property_name);
-  canonicalize_key (canonical_name);
-  if (data->packing)
-    pspec = gtk_container_class_find_child_property (class, canonical_name);
-  else if (data->cell_packing)
-    {
-      GObjectClass *cell_class;
-
-      /* We're just assuming that the cell layout is using a GtkCellAreaBox. */
-      cell_class = g_type_class_ref (GTK_TYPE_CELL_AREA_BOX);
-      pspec = gtk_cell_area_class_find_cell_property (GTK_CELL_AREA_CLASS (cell_class), canonical_name);
-      g_type_class_unref (cell_class);
-    }
-  else
-    pspec = g_object_class_find_property (class, canonical_name);
-  g_free (canonical_name);
-  g_type_class_unref (class);
-
-  return pspec;
-}
-
-
-static gboolean
-value_is_default (MyParserData *data,
-                  const gchar  *class_name,
-                  const gchar  *property_name,
-                  const gchar  *value_string)
-{
-  GValue value = { 0, };
-  gboolean ret;
-  GError *error = NULL;
-  GParamSpec *pspec;
-
-  pspec = get_property_pspec (data, class_name, property_name);
-
-  if (pspec == NULL)
-    {
-      if (data->packing)
-        g_printerr (_("Packing property %s::%s not found\n"), class_name, property_name);
-      else if (data->cell_packing)
-        g_printerr (_("Cell property %s::%s not found\n"), class_name, property_name);
-      else
-        g_printerr (_("Property %s::%s not found\n"), class_name, property_name);
-      return FALSE;
-    }
-  else if (g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (pspec), G_TYPE_OBJECT))
-    return FALSE;
-
-  if (!gtk_builder_value_from_string (data->builder, pspec, value_string, &value, &error))
-    {
-      g_printerr (_("Couldn’t parse value for %s::%s: %s\n"), class_name, property_name, error->message);
-      g_error_free (error);
-      ret = FALSE;
-    }
-  else
-    ret = g_param_value_defaults (pspec, &value);
-
-  g_value_reset (&value);
-
-  return ret;
-}
-
-static gboolean
-property_is_boolean (MyParserData *data,
-                     const gchar  *class_name,
-                     const gchar  *property_name)
-{
-  GParamSpec *pspec;
-
-  pspec = get_property_pspec (data, class_name, property_name);
-  if (pspec)
-    return G_PARAM_SPEC_VALUE_TYPE (pspec) == G_TYPE_BOOLEAN;
-
-  return FALSE;
-}
-
-static const gchar *
-canonical_boolean_value (MyParserData *data,
-                         const gchar  *string)
-{
-  GValue value = G_VALUE_INIT;
-  gboolean b = FALSE;
-
-  if (gtk_builder_value_from_string_type (data->builder, G_TYPE_BOOLEAN, string, &value, NULL))
-    b = g_value_get_boolean (&value);
-
-  return b ? "1" : "0";
-}
-
-/* A number of properties unfortunately can't be omitted even
- * if they are nominally set to their default value. In many
- * cases, this is due to subclasses not overriding the default
- * value from the superclass.
- */
-static gboolean
-needs_explicit_setting (MyParserData *data,
-                        const gchar  *class_name,
-                        const gchar  *property_name)
-{
-  struct _Prop {
-    const char *class;
-    const char *property;
-    gboolean packing;
-  } props[] = {
-    { "GtkAboutDialog", "program-name", 0 },
-    { "GtkCalendar", "year", 0 },
-    { "GtkCalendar", "month", 0 },
-    { "GtkCalendar", "day", 0 },
-    { "GtkPlacesSidebar", "show-desktop", 0 },
-    { "GtkRadioButton", "draw-indicator", 0 },
-    { "GtkGrid", "left-attach", 1 },
-    { "GtkGrid", "top-attach", 1 },
-    { "GtkWidget", "hexpand", 0 },
-    { "GtkWidget", "vexpand", 0 },
-    { NULL, NULL, 0 }
-  };
-  gchar *canonical_name;
-  gboolean found;
-  gint k;
-
-  canonical_name = g_strdup (property_name);
-  g_strdelimit (canonical_name, "_", '-');
-
-  found = FALSE;
-  for (k = 0; props[k].class; k++)
-    {
-      if (strcmp (class_name, props[k].class) == 0 &&
-          strcmp (canonical_name, props[k].property) == 0 &&
-          data->packing == props[k].packing)
-        {
-          found = TRUE;
-          break;
-        }
-    }
-
-  g_free (canonical_name);
-
-  return found;
-}
-
-static void
-maybe_start_packing (MyParserData *data)
-{
-  if (data->packing)
-    {
-      if (!data->packing_started)
-        {
-          g_fprintf (data->output, "%*s<packing>\n", data->indent, "");
-          data->indent += 2;
-          data->packing_started = TRUE;
-        }
-    }
-}
-
-static void
-maybe_start_cell_packing (MyParserData *data)
-{
-  if (data->cell_packing)
-    {
-      if (!data->cell_packing_started)
-        {
-          g_fprintf (data->output, "%*s<cell-packing>\n", data->indent, "");
-          data->indent += 2;
-          data->cell_packing_started = TRUE;
-        }
-    }
-}
-
-static void
-maybe_start_child (MyParserData *data)
-{
-  if (data->in_child > 0)
-    {
-      if (data->child_started < data->in_child)
-        {
-          g_fprintf (data->output, "%*s<child>\n", data->indent, "");
-          data->indent += 2;
-          data->child_started += 1;
-        }
-    }
-}
-
-static void
-maybe_emit_property (MyParserData *data)
-{
-  gint i;
-  gboolean bound;
-  gboolean translatable;
-  gchar *escaped;
-  const gchar *class_name;
-  const gchar *property_name;
-  const gchar *value_string;
-
-  class_name = (const gchar *)data->classes->data;
-  property_name = "";
-  value_string = (const gchar *)data->value->str;
-
-  bound = FALSE;
-  translatable = FALSE;
-  for (i = 0; data->attribute_names[i]; i++)
-    {
-      if (strcmp (data->attribute_names[i], "bind-source") == 0 ||
-          strcmp (data->attribute_names[i], "bind_source") == 0)
-        bound = TRUE;
-      else if (strcmp (data->attribute_names[i], "translatable") == 0)
-        translatable = TRUE;
-      else if (strcmp (data->attribute_names[i], "name") == 0)
-        property_name = (const gchar *)data->attribute_values[i];
-    }
-
-  if (!translatable &&
-      !bound &&
-      !needs_explicit_setting (data, class_name, property_name))
-    {
-      for (i = 0; data->attribute_names[i]; i++)
-        {
-          if (strcmp (data->attribute_names[i], "name") == 0)
-            {
-              if (data->classes == NULL)
-                break;
-
-              if (value_is_default (data, class_name, property_name, value_string))
-                return;
-            }
-        }
-    }
-
-  maybe_start_packing (data);
-  maybe_start_cell_packing (data);
-
-  g_fprintf (data->output, "%*s<property", data->indent, "");
-  for (i = 0; data->attribute_names[i]; i++)
-    {
-      if (!translatable &&
-          (strcmp (data->attribute_names[i], "comments") == 0 ||
-           strcmp (data->attribute_names[i], "context") == 0))
-        continue;
-
-      escaped = g_markup_escape_text (data->attribute_values[i], -1);
-
-      if (strcmp (data->attribute_names[i], "name") == 0)
-        canonicalize_key (escaped);
-
-      g_fprintf (data->output, " %s=\"%s\"", data->attribute_names[i], escaped);
-      g_free (escaped);
-    }
-
-  if (bound)
-    {
-      g_fprintf (data->output, "/>\n");
-    }
-  else
-    {
-      g_fprintf (data->output, ">");
-      if (property_is_boolean (data, class_name, property_name))
-        {
-          g_fprintf (data->output, "%s", canonical_boolean_value (data, value_string));
-        }
-      else
-        {
-          escaped = g_markup_escape_text (value_string, -1);
-          g_fprintf (data->output, "%s", escaped);
-          g_free (escaped);
-        }
-      g_fprintf (data->output, "</property>\n");
-    }
-}
-
-static void
-maybe_close_starttag (MyParserData *data)
-{
-  if (data->unclosed_starttag)
-    {
-      g_fprintf (data->output, ">\n");
-      data->unclosed_starttag = FALSE;
-    }
-}
-
-static gboolean
-stack_is (GMarkupParseContext *context,
-          ...)
-{
-  va_list args;
-  gchar *s, *p;
-  const GSList *stack;
-
-  stack = g_markup_parse_context_get_element_stack (context);
-
-  va_start (args, context);
-  s = va_arg (args, gchar *);
-  while (s)
-    {
-      if (stack == NULL)
-        {
-          va_end (args);
-          return FALSE;
-        }
-
-      p = (gchar *)stack->data;
-      if (strcmp (s, p) != 0)
-        {
-          va_end (args);
-          return FALSE;
-        }
-
-      s = va_arg (args, gchar *);
-      stack = stack->next;
-    }
-
-  va_end (args);
-  return TRUE;
-}
-
-static void
-start_element (GMarkupParseContext  *context,
-               const gchar          *element_name,
-               const gchar         **attribute_names,
-               const gchar         **attribute_values,
-               gpointer              user_data,
-               GError              **error)
-{
-  gint i;
-  gchar *escaped;
-  MyParserData *data = user_data;
-
-  maybe_close_starttag (data);
-
-  if (strcmp (element_name, "property") == 0)
-    {
-      g_assert (data->attribute_names == NULL);
-      g_assert (data->attribute_values == NULL);
-      g_assert (data->value == NULL);
-
-      data->attribute_names = g_strdupv ((gchar **)attribute_names);
-      data->attribute_values = g_strdupv ((gchar **)attribute_values);
-      data->value = g_string_new ("");
-
-      return;
-    }
-  else if (strcmp (element_name, "packing") == 0)
-    {
-      data->packing = TRUE;
-      data->packing_started = FALSE;
-
-      return;
-    }
-  else if (strcmp (element_name, "cell-packing") == 0)
-    {
-      data->cell_packing = TRUE;
-      data->cell_packing_started = FALSE;
-
-      return;
-    }
-  else if (strcmp (element_name, "child") == 0)
-    {
-      data->in_child += 1;
-
-      if (attribute_names[0] == NULL)
-        return;
-
-      data->child_started += 1;
-    }
-  else if (strcmp (element_name, "attribute") == 0)
-    {
-      /* attribute in label has no content */
-      if (data->classes == NULL ||
-          strcmp ((gchar *)data->classes->data, "GtkLabel") != 0)
-        data->value = g_string_new ("");
-    }
-  else if (stack_is (context, "item", "items", NULL) ||
-           stack_is (context, "action-widget", "action-widgets", NULL) ||
-           stack_is (context, "mime-type", "mime-types", NULL) ||
-           stack_is (context, "pattern", "patterns", NULL) ||
-           stack_is (context, "application", "applications", NULL) ||
-           stack_is (context, "col", "row", "data", NULL) ||
-           stack_is (context, "mark", "marks", NULL) ||
-           stack_is (context, "action", "accessibility", NULL))
-    {
-      data->value = g_string_new ("");
-    }
-  else if (strcmp (element_name, "placeholder") == 0)
-    {
-      return;
-    }
-  else if (strcmp (element_name, "object") == 0 ||
-           strcmp (element_name, "template") == 0)
-    {
-      maybe_start_child (data);
-
-      for (i = 0; attribute_names[i]; i++)
-        {
-          if (strcmp (attribute_names[i], "class") == 0)
-            {
-              data->classes = g_list_prepend (data->classes,
-                                              g_strdup (attribute_values[i]));
-              break;
-            }
-        }
-    }
-
-  g_fprintf (data->output, "%*s<%s", data->indent, "", element_name);
-  for (i = 0; attribute_names[i]; i++)
-    {
-      escaped = g_markup_escape_text (attribute_values[i], -1);
-      g_fprintf (data->output, " %s=\"%s\"", attribute_names[i], escaped);
-      g_free (escaped);
-    }
-  data->unclosed_starttag = TRUE;
-  data->indent += 2;
-}
-
-static void
-end_element (GMarkupParseContext  *context,
-             const gchar          *element_name,
-             gpointer              user_data,
-             GError              **error)
-{
-  MyParserData *data = user_data;
-
-  if (strcmp (element_name, "property") == 0)
-    {
-      maybe_emit_property (data);
-
-      g_clear_pointer (&data->attribute_names, g_strfreev);
-      g_clear_pointer (&data->attribute_values, g_strfreev);
-      g_string_free (data->value, TRUE);
-      data->value = NULL;
-      return;
-    }
-  else if (strcmp (element_name, "packing") == 0)
-    {
-      data->packing = FALSE;
-      if (!data->packing_started)
-        return;
-    }
-  else if (strcmp (element_name, "cell-packing") == 0)
-    {
-      data->cell_packing = FALSE;
-      if (!data->cell_packing_started)
-        return;
-    }
-  else if (strcmp (element_name, "child") == 0)
-    {
-      data->in_child -= 1;
-      if (data->child_started == data->in_child)
-        return;
-      data->child_started -= 1;
-    }
-  else if (strcmp (element_name, "placeholder") == 0)
-    {
-      return;
-    }
-  else if (strcmp (element_name, "object") == 0 ||
-           strcmp (element_name, "template") == 0)
-    {
-      g_free (data->classes->data);
-      data->classes = g_list_delete_link (data->classes, data->classes);
-    }
-
-  if (data->value != NULL)
-    {
-      gchar *escaped;
-
-      if (data->unclosed_starttag)
-        g_fprintf (data->output, ">");
-
-      escaped = g_markup_escape_text (data->value->str, -1);
-      g_fprintf (data->output, "%s</%s>\n", escaped, element_name);
-      g_free (escaped);
-
-      g_string_free (data->value, TRUE);
-      data->value = NULL;
-    }
-  else
-    {
-      if (data->unclosed_starttag)
-        g_fprintf (data->output, "/>\n");
-      else
-        g_fprintf (data->output, "%*s</%s>\n", data->indent - 2, "", element_name);
-    }
-
-  data->indent -= 2;
-  data->unclosed_starttag = FALSE;
-}
-
-static void
-text (GMarkupParseContext  *context,
-      const gchar          *text,
-      gsize                 text_len,
-      gpointer              user_data,
-      GError              **error)
-{
-  MyParserData *data = user_data;
-
-  if (data->value)
-    {
-      g_string_append_len (data->value, text, text_len);
-      return;
-    }
-}
-
-static void
-passthrough (GMarkupParseContext  *context,
-             const gchar          *text,
-             gsize                 text_len,
-             gpointer              user_data,
-             GError              **error)
-{
-  MyParserData *data = user_data;
-
-  maybe_close_starttag (data);
-
-  g_fprintf (data->output, "%*s%s\n", data->indent, "", text);
-}
-
-GMarkupParser parser = {
-  start_element,
-  end_element,
-  text,
-  passthrough,
-  NULL
-};
-
-static void
-do_simplify (int          *argc,
-             const char ***argv)
-{
-  GMarkupParseContext *context;
-  gchar *buffer;
-  MyParserData data;
-  gboolean replace = FALSE;
-  char **filenames = NULL;
-  GOptionContext *ctx;
-  const GOptionEntry entries[] = {
-    { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, NULL, NULL },
-    { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, NULL },
-    { NULL, }
-  };
-  GError *error = NULL;
-
-  ctx = g_option_context_new (NULL);
-  g_option_context_set_help_enabled (ctx, FALSE);
-  g_option_context_add_main_entries (ctx, entries, NULL);
-
-  if (!g_option_context_parse (ctx, argc, (char ***)argv, &error))
-    {
-      g_printerr ("%s\n", error->message);
-      g_error_free (error);
-      exit (1);
-    }
-
-  g_option_context_free (ctx);
-
-  if (filenames == NULL)
-    {
-      g_printerr ("No .ui file specified\n");
-      exit (1);
-    }
-
-  if (g_strv_length (filenames) > 1)
-    {
-      g_printerr ("Can only simplify a single .ui file\n");
-      exit (1);
-    }
-
-  data.input_filename = filenames[0];
-  data.output_filename = NULL;
-
-  if (replace)
-    {
-      int fd;
-      fd = g_file_open_tmp ("gtk-builder-tool-XXXXXX", &data.output_filename, NULL);
-      data.output = fdopen (fd, "w");
-    }
-  else
-    {
-      data.output = stdout;
-    }
-
-  if (!g_file_get_contents (filenames[0], &buffer, NULL, &error))
-    {
-      g_printerr (_("Can’t load file: %s\n"), error->message);
-      exit (1);
-    }
-
-  data.builder = gtk_builder_new ();
-  data.classes = NULL;
-  data.attribute_names = NULL;
-  data.attribute_values = NULL;
-  data.value = NULL;
-  data.packing = FALSE;
-  data.packing_started = FALSE;
-  data.cell_packing = FALSE;
-  data.cell_packing_started = FALSE;
-  data.in_child = 0;
-  data.child_started = 0;
-  data.unclosed_starttag = FALSE;
-  data.indent = 0;
-
-  context = g_markup_parse_context_new (&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, &data, NULL);
-  if (!g_markup_parse_context_parse (context, buffer, -1, &error))
-    {
-      g_printerr (_("Can’t parse file: %s\n"), error->message);
-      exit (1);
-    }
-
-  fclose (data.output);
-
-  if (data.output_filename)
-    {
-      char *content;
-      gsize length;
-
-      if (!g_file_get_contents (data.output_filename, &content, &length, &error))
-        {
-          g_printerr ("Failed to read %s: %s\n", data.output_filename, error->message);
-          exit (1);
-        }
-
-      if (!g_file_set_contents (data.input_filename, content, length, &error))
-        {
-          g_printerr ("Failed to write %s: %s\n", data.input_filename, error->message);
-          exit (1);
-        }
-    }
-}
-
-static GType
-make_fake_type (const gchar *type_name,
-                const gchar *parent_name)
-{
-  GType parent_type;
-  GTypeQuery query;
-
-  parent_type = g_type_from_name (parent_name);
-  if (parent_type == G_TYPE_INVALID)
-    {
-      g_printerr ("Failed to lookup template parent type %s\n", parent_name);
-      exit (1);
-    }
-
-  g_type_query (parent_type, &query);
-  return g_type_register_static_simple (parent_type,
-                                        type_name,
-                                        query.class_size,
-                                        NULL,
-                                        query.instance_size,
-                                        NULL,
-                                        0);
-}
-
-static void
-do_validate_template (const gchar *filename,
-                      const gchar *type_name,
-                      const gchar *parent_name)
-{
-  GType template_type;
-  GtkWidget *widget;
-  GtkBuilder *builder;
-  GError *error = NULL;
-  gint ret;
-
-  /* Only make a fake type if it doesn't exist yet.
-   * This lets us e.g. validate the GtkFileChooserWidget template.
-   */
-  template_type = g_type_from_name (type_name);
-  if (template_type == G_TYPE_INVALID)
-    template_type = make_fake_type (type_name, parent_name);
-
-  widget = g_object_new (template_type, NULL);
-  if (!widget)
-    {
-      g_printerr ("Failed to create an instance of the template type %s\n", type_name);
-      exit (1);
-    }
-
-  builder = gtk_builder_new ();
-  ret = gtk_builder_extend_with_template (builder, widget, template_type, " ", 1, &error);
-  if (ret)
-    ret = gtk_builder_add_from_file (builder, filename, &error);
-  g_object_unref (builder);
-
-  if (ret == 0)
-    {
-      g_printerr ("%s\n", error->message);
-      exit (1);
-    }
-}
-
-static gboolean
-parse_template_error (const gchar  *message,
-                      gchar       **class_name,
-                      gchar       **parent_name)
-{
-  gchar *p;
-
-  if (!strstr (message, "Not expecting to handle a template"))
-    return FALSE;
-
-  p = strstr (message, "(class '");
-  if (p)
-    {
-      *class_name = g_strdup (p + strlen ("(class '"));
-      p = strstr (*class_name, "'");
-      if (p)
-        *p = '\0';
-    }
-  p = strstr (message, ", parent '");
-  if (p)
-    {
-      *parent_name = g_strdup (p + strlen (", parent '"));
-      p = strstr (*parent_name, "'");
-      if (p)
-        *p = '\0';
-    }
-
-  return TRUE;
-}
-
-static void
-do_validate (const gchar *filename)
-{
-  GtkBuilder *builder;
-  GError *error = NULL;
-  gint ret;
-  gchar *class_name = NULL;
-  gchar *parent_name = NULL;
-
-  builder = gtk_builder_new ();
-  ret = gtk_builder_add_from_file (builder, filename, &error);
-  g_object_unref (builder);
-
-  if (ret == 0)
-    {
-      if (g_error_matches (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_UNHANDLED_TAG)  &&
-          parse_template_error (error->message, &class_name, &parent_name))
-        {
-          do_validate_template (filename, class_name, parent_name);
-        }
-      else
-        {
-          g_printerr ("%s\n", error->message);
-          exit (1);
-        }
-    }
-}
-
-static const gchar *
-object_get_name (GObject *object)
-{
-  if (GTK_IS_BUILDABLE (object))
-    return gtk_buildable_get_name (GTK_BUILDABLE (object));
-  else
-    return g_object_get_data (object, "gtk-builder-name");
-}
-
-static void
-do_enumerate (const gchar *filename)
-{
-  GtkBuilder *builder;
-  GError *error = NULL;
-  gint ret;
-  GSList *list, *l;
-  GObject *object;
-  const gchar *name;
-
-  builder = gtk_builder_new ();
-  ret = gtk_builder_add_from_file (builder, filename, &error);
-
-  if (ret == 0)
-    {
-      g_printerr ("%s\n", error->message);
-      exit (1);
-    }
-
-  list = gtk_builder_get_objects (builder);
-  for (l = list; l; l = l->next)
-    {
-      object = l->data;
-      name = object_get_name (object);
-      if (g_str_has_prefix (name, "___") && g_str_has_suffix (name, "___"))
-        continue;
-
-      g_printf ("%s (%s)\n", name, g_type_name_from_instance ((GTypeInstance*)object));
-    }
-  g_slist_free (list);
-
-  g_object_unref (builder);
-}
-
-static void
-set_window_title (GtkWindow  *window,
-                  const char *filename,
-                  const char *id)
-{
-  gchar *name;
-  gchar *title;
-
-  name = g_path_get_basename (filename);
-
-  if (id)
-    title = g_strdup_printf ("%s in %s", id, name);
-  else
-    title = g_strdup (name);
-
-  gtk_window_set_title (window, title);
-
-  g_free (title);
-  g_free (name);
-}
-
-static void
-preview_file (const char *filename,
-              const char *id,
-              const char *cssfile)
-{
-  GtkBuilder *builder;
-  GError *error = NULL;
-  GObject *object;
-  GtkWidget *window;
-
-  if (cssfile)
-    {
-      GtkCssProvider *provider;
-
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_path (provider, cssfile);
-
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
-
-  builder = gtk_builder_new ();
-  if (!gtk_builder_add_from_file (builder, filename, &error))
-    {
-      g_printerr ("%s\n", error->message);
-      exit (1);
-    }
-
-  object = NULL;
-
-  if (id)
-    {
-      object = gtk_builder_get_object (builder, id);
-    }
-  else
-    {
-      GSList *objects, *l;
-
-      objects = gtk_builder_get_objects (builder);
-      for (l = objects; l; l = l->next)
-        {
-          GObject *obj = l->data;
-
-          if (GTK_IS_WINDOW (obj))
-            {
-              object = obj;
-              break;
-            }
-          else if (GTK_IS_WIDGET (obj))
-            {
-              if (object == NULL)
-                object = obj;
-            }
-        }
-      g_slist_free (objects);
-    }
-
-  if (object == NULL)
-    {
-      if (id)
-        g_printerr ("No object with ID '%s' found\n", id);
-      else
-        g_printerr ("No previewable object found\n");
-      exit (1);
-    }
-
-  if (!GTK_IS_WIDGET (object))
-    {
-      g_printerr ("Objects of type %s can't be previewed\n", G_OBJECT_TYPE_NAME (object));
-      exit (1);
-    }
-
-  if (GTK_IS_WINDOW (object))
-    window = GTK_WIDGET (object);
-  else
-    {
-      GtkWidget *widget = GTK_WIDGET (object);
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-      if (GTK_IS_BUILDABLE (object))
-        id = gtk_buildable_get_name (GTK_BUILDABLE (object));
-
-      set_window_title (GTK_WINDOW (window), filename, id);
-
-      g_object_ref (widget);
-      if (gtk_widget_get_parent (widget) != NULL)
-        gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);
-      gtk_container_add (GTK_CONTAINER (window), widget);
-      g_object_unref (widget);
-    }
-
-  gtk_window_present (GTK_WINDOW (window));
-
-  gtk_main ();
-
-  g_object_unref (builder);
-}
-
-static void
-do_preview (int          *argc,
-            const char ***argv)
-{
-  GOptionContext *context;
-  char *id = NULL;
-  char *css = NULL;
-  char **filenames = NULL;
-  const GOptionEntry entries[] = {
-    { "id", 0, 0, G_OPTION_ARG_STRING, &id, NULL, NULL },
-    { "css", 0, 0, G_OPTION_ARG_FILENAME, &css, NULL, NULL },
-    { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, NULL },
-    { NULL, }
-  };
-  GError *error = NULL;
-
-  context = g_option_context_new (NULL);
-  g_option_context_set_help_enabled (context, FALSE);
-  g_option_context_add_main_entries (context, entries, NULL);
-
-  if (!g_option_context_parse (context, argc, (char ***)argv, &error))
-    {
-      g_printerr ("%s\n", error->message);
-      g_error_free (error);
-      exit (1);
-    }
-
-  g_option_context_free (context);
-
-  if (filenames == NULL)
-    {
-      g_printerr ("No .ui file specified\n");
-      exit (1);
-    }
-
-  if (g_strv_length (filenames) > 1)
-    {
-      g_printerr ("Can only preview a single .ui file\n");
-      exit (1);
-    }
-
-  preview_file (filenames[0], id, css);
-
-  g_strfreev (filenames);
-  g_free (id);
-  g_free (css);
-}
+extern void do_simplify  (int *argc, const char ***argv);
+extern void do_validate  (int *argc, const char ***argv);
+extern void do_enumerate (int *argc, const char ***argv);
+extern void do_preview   (int *argc, const char ***argv);
 
 static void
 usage (void)
@@ -1062,6 +46,7 @@ usage (void)
              "\n"
              "Simplify Options:\n"
              "  --replace          Replace the file\n"
+             "  --3to4             Convert from a GTK3 to GTK4\n"
              "\n"
              "Preview Options:\n"
              "  --id=ID            Preview only the named object\n"
@@ -1090,11 +75,11 @@ main (int argc, const char *argv[])
   argc--;
 
   if (strcmp (argv[0], "validate") == 0)
-    do_validate (argv[1]);
+    do_validate (&argc, &argv);
   else if (strcmp (argv[0], "simplify") == 0)
     do_simplify (&argc, &argv);
   else if (strcmp (argv[0], "enumerate") == 0)
-    do_enumerate (argv[1]);
+    do_enumerate (&argc, &argv);
   else if (strcmp (argv[0], "preview") == 0)
     do_preview (&argc, &argv);
   else
diff --git a/gtk/tools/meson.build b/gtk/tools/meson.build
index 39dcde097f..e082bc833f 100644
--- a/gtk/tools/meson.build
+++ b/gtk/tools/meson.build
@@ -1,7 +1,11 @@
 # Installed tools
 gtk_tools = [
   ['gtk4-query-settings', ['gtk-query-settings.c']],
-  ['gtk4-builder-tool', ['gtk-builder-tool.c']],
+  ['gtk4-builder-tool', ['gtk-builder-tool.c',
+                         'gtk-builder-tool-simplify.c',
+                         'gtk-builder-tool-validate.c',
+                         'gtk-builder-tool-enumerate.c',
+                         'gtk-builder-tool-preview.c']],
   ['gtk4-update-icon-cache', ['updateiconcache.c', 'gtkiconcachevalidator.c']],
   ['gtk4-encode-symbolic-svg', ['encodesymbolic.c', 'gdkpixbufutils.c']],
 ]
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 01488cd574..7fe6da1351 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAboutDialog" parent="GtkDialog">
     <property name="resizable">0</property>
     <property name="type-hint">dialog</property>
@@ -47,179 +45,187 @@
                 <property name="vexpand">1</property>
                 <signal name="notify::visible-child" handler="stack_visible_child_notify" swapped="no"/>
                 <child>
-                  <object class="GtkBox" id="page_vbox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkLabel" id="version_label">
-                        <property name="visible">0</property>
-                        <property name="label">version 1.0</property>
-                        <property name="justify">center</property>
-                        <property name="selectable">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="comments_label">
-                        <property name="visible">0</property>
-                        <property name="label">comments</property>
-                        <property name="justify">center</property>
-                        <property name="wrap">1</property>
-                        <property name="selectable">1</property>
-                        <property name="max-width-chars">60</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="website_label">
-                        <property name="visible">0</property>
-                        <property name="label">http://website.com</property>
-                        <property name="selectable">1</property>
-                        <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="copyright_label">
-                        <property name="visible">0</property>
-                        <property name="label">copyright</property>
-                        <property name="justify">center</property>
-                        <property name="wrap">1</property>
-                        <property name="selectable">1</property>
-                        <property name="max-width-chars">60</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="license_label">
-                        <property name="visible">0</property>
-                        <property name="label">license</property>
-                        <property name="use-markup">1</property>
-                        <property name="justify">center</property>
-                        <property name="wrap">1</property>
-                        <property name="selectable">1</property>
-                        <property name="max-width-chars">60</property>
-                        <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">main</property>
                     <property name="title" translatable="yes">About</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="credits_page">
-                    <property name="visible">0</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
-                        <property name="hscrollbar-policy">never</property>
-                        <property name="shadow-type">in</property>
-                        <property name="vexpand">1</property>
+                    <property name="child">
+                      <object class="GtkBox" id="page_vbox">
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">8</property>
                         <child>
-                          <object class="GtkViewport" id="viewport1">
-                            <style>
-                              <class name="view"/>
-                            </style>
-                            <child>
-                              <object class="GtkGrid" id="credits_grid">
-                                <property name="halign">center</property>
-                                <property name="valign">start</property>
-                                <property name="orientation">vertical</property>
-                                <property name="row-spacing">2</property>
-                                <property name="column-spacing">8</property>
-                                <property name="margin">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkLabel" id="version_label">
+                            <property name="visible">0</property>
+                            <property name="label">version 1.0</property>
+                            <property name="justify">center</property>
+                            <property name="selectable">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="comments_label">
+                            <property name="visible">0</property>
+                            <property name="label">comments</property>
+                            <property name="justify">center</property>
+                            <property name="wrap">1</property>
+                            <property name="selectable">1</property>
+                            <property name="max-width-chars">60</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="website_label">
+                            <property name="visible">0</property>
+                            <property name="label">http://website.com</property>
+                            <property name="selectable">1</property>
+                            <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="copyright_label">
+                            <property name="visible">0</property>
+                            <property name="label">copyright</property>
+                            <property name="justify">center</property>
+                            <property name="wrap">1</property>
+                            <property name="selectable">1</property>
+                            <property name="max-width-chars">60</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="license_label">
+                            <property name="visible">0</property>
+                            <property name="label">license</property>
+                            <property name="use-markup">1</property>
+                            <property name="justify">center</property>
+                            <property name="wrap">1</property>
+                            <property name="selectable">1</property>
+                            <property name="max-width-chars">60</property>
+                            <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
                           </object>
                         </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
                     <property name="name">credits</property>
                     <property name="title" translatable="yes">Credits</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="license_page">
-                    <property name="visible">0</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow2">
-                        <property name="hscrollbar-policy">never</property>
-                        <property name="shadow-type">in</property>
-                        <property name="vexpand">1</property>
+                    <property name="child">
+                      <object class="GtkBox" id="credits_page">
+                        <property name="visible">0</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">8</property>
                         <child>
-                          <object class="GtkTextView" id="license_view">
-                            <property name="editable">0</property>
-                            <property name="left-margin">8</property>
-                            <property name="right-margin">8</property>
-                            <property name="cursor-visible">0</property>
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
+                            <property name="hscrollbar-policy">never</property>
+                            <property name="shadow-type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
-                              <object class="GtkGestureMultiPress">
-                                <signal name="released" handler="text_view_released" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkEventControllerMotion">
-                                <signal name="motion" handler="text_view_motion" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkEventControllerKey">
-                                <signal name="key-pressed" handler="text_view_key_pressed" swapped="no"/>
+                              <object class="GtkViewport" id="viewport1">
+                                <style>
+                                  <class name="view"/>
+                                </style>
+                                <child>
+                                  <object class="GtkGrid" id="credits_grid">
+                                    <property name="halign">center</property>
+                                    <property name="valign">start</property>
+                                    <property name="orientation">vertical</property>
+                                    <property name="row-spacing">2</property>
+                                    <property name="column-spacing">8</property>
+                                    <property name="margin">5</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
                     <property name="name">license</property>
                     <property name="title" translatable="yes">License</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="system_page">
-                    <property name="visible">0</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="hscrollbar-policy">never</property>
-                        <property name="shadow-type">in</property>
-                        <property name="vexpand">1</property>
+                    <property name="child">
+                      <object class="GtkBox" id="license_page">
+                        <property name="visible">0</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">8</property>
                         <child>
-                          <object class="GtkTextView" id="system_view">
-                            <property name="editable">0</property>
-                            <property name="left-margin">8</property>
-                            <property name="right-margin">8</property>
-                            <property name="cursor-visible">0</property>
+                          <object class="GtkScrolledWindow" id="scrolledwindow2">
+                            <property name="hscrollbar-policy">never</property>
+                            <property name="shadow-type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
-                              <object class="GtkGestureMultiPress">
-                                <signal name="released" handler="text_view_released" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkEventControllerMotion">
-                                <signal name="motion" handler="text_view_motion" swapped="no"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkEventControllerKey">
-                                <signal name="key-pressed" handler="text_view_key_pressed" swapped="no"/>
+                              <object class="GtkTextView" id="license_view">
+                                <property name="editable">0</property>
+                                <property name="left-margin">8</property>
+                                <property name="right-margin">8</property>
+                                <property name="cursor-visible">0</property>
+                                <child>
+                                  <object class="GtkGestureMultiPress">
+                                    <signal name="released" handler="text_view_released" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEventControllerMotion">
+                                    <signal name="motion" handler="text_view_motion" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEventControllerKey">
+                                    <signal name="key-pressed" handler="text_view_key_pressed" swapped="no"/>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
                     <property name="name">system</property>
                     <property name="title" translatable="yes">System</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkBox" id="system_page">
+                        <property name="visible">0</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">8</property>
+                        <child>
+                          <object class="GtkScrolledWindow">
+                            <property name="hscrollbar-policy">never</property>
+                            <property name="shadow-type">in</property>
+                            <property name="vexpand">1</property>
+                            <child>
+                              <object class="GtkTextView" id="system_view">
+                                <property name="editable">0</property>
+                                <property name="left-margin">8</property>
+                                <property name="right-margin">8</property>
+                                <property name="cursor-visible">0</property>
+                                <child>
+                                  <object class="GtkGestureMultiPress">
+                                    <signal name="released" handler="text_view_released" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEventControllerMotion">
+                                    <signal name="motion" handler="text_view_motion" swapped="no"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEventControllerKey">
+                                    <signal name="key-pressed" handler="text_view_key_pressed" swapped="no"/>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                  </object>
                 </child>
               </object>
             </child>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 6a3e0461a2..e309422f76 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAppChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Application</property>
     <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index d59a042f07..d23a402ca8 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -1,27 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="program_list_store">
     <columns>
-      <!-- column-name app-info -->
       <column type="GAppInfo"/>
-      <!-- column-name app-icon -->
       <column type="GIcon"/>
-      <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name description -->
       <column type="gchararray"/>
-      <!-- column-name exec -->
       <column type="gchararray"/>
-      <!-- column-name default -->
       <column type="gboolean"/>
-      <!-- column-name heading -->
       <column type="gboolean"/>
-      <!-- column-name heading-text -->
       <column type="gchararray"/>
-      <!-- column-name recommended -->
       <column type="gboolean"/>
-      <!-- column-name fallback -->
       <column type="gboolean"/>
     </columns>
   </object>
@@ -112,7 +100,7 @@
                 <property name="valign">center</property>
                 <property name="wrap">1</property>
                 <attributes>
-                  <attribute name="scale" value="1.2"/>
+                  <attribute name="scale" value="1.2"></attribute>
                 </attributes>
                 <style>
                   <class name="dim-label"/>
diff --git a/gtk/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui
index 92d01623bd..42fc3127b2 100644
--- a/gtk/ui/gtkapplication-quartz.ui
+++ b/gtk/ui/gtkapplication-quartz.ui
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <menu id="app-menu">
     <section>
       <item>
-        <!-- used for the application menu on MacOS.  %s is replaced with the application name. -->
         <attribute name="label" translatable="yes">About %s</attribute>
         <attribute name="action">app.about</attribute>
         <attribute name="x-gtk-private-special">replace-appname</attribute>
@@ -11,33 +9,28 @@
     </section>
     <section>
       <item>
-        <!-- used for the application menu on MacOS -->
         <attribute name="label" translatable="yes">Preferences</attribute>
         <attribute name="action">app.preferences</attribute>
       </item>
     </section>
     <section>
       <item>
-        <!-- used for the application menu on MacOS -->
         <attribute name="label" translatable="yes">Services</attribute>
         <attribute name="x-gtk-private-special">services-submenu</attribute>
       </item>
     </section>
     <section>
       <item>
-        <!-- used for the application menu on MacOS.  %s is replaced with the application name. -->
         <attribute name="label" translatable="yes">Hide %s</attribute>
         <attribute name="x-gtk-private-special">hide-this</attribute>
         <attribute name="action">gtkinternal.hide</attribute>
       </item>
       <item>
-        <!-- used for the application menu on MacOS -->
         <attribute name="label" translatable="yes">Hide Others</attribute>
         <attribute name="x-gtk-private-special">hide-others</attribute>
         <attribute name="action">gtkinternal.hide-others</attribute>
       </item>
       <item>
-        <!-- used for the application menu on MacOS -->
         <attribute name="label" translatable="yes">Show All</attribute>
         <attribute name="x-gtk-private-special">show-all</attribute>
         <attribute name="action">gtkinternal.show-all</attribute>
@@ -45,7 +38,6 @@
     </section>
     <section>
       <item>
-        <!-- used for the application menu on MacOS.  %s is replaced with the application name. -->
         <attribute name="label" translatable="yes">Quit %s</attribute>
         <attribute name="action">app.quit</attribute>
         <attribute name="x-gtk-private-special">replace-appname</attribute>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index 6cb60f6a6f..d519a79ce9 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAssistant" parent="GtkWindow">
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar"/>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index a0f7342d15..7eb0d14636 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkColorChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select a Color</property>
     <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 7c281adcf5..fb650a34d8 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtkprivate 3.10 -->
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkAdjustment" id="a_adj">
     <property name="upper">1</property>
     <property name="step-increment">0.01</property>
@@ -27,7 +24,6 @@
     <signal name="value-changed" handler="hsv_changed" object="GtkColorEditor" swapped="yes"/>
   </object>
   <template class="GtkColorEditor" parent="GtkBox">
-    <property name="can-focus">False</property>
     <signal name="notify::visible" handler="dismiss_current_popup" swapped="no"/>
     <child>
       <object class="GtkOverlay" id="overlay">
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index 533a799c88..9cd3b3d735 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkComboBox" parent="GtkBin">
     <child>
       <object class="GtkBox" id="box">
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 6780d241c7..33d768e86a 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkDialog" parent="GtkWindow">
     <property name="window-position">center-on-parent</property>
     <property name="type-hint">dialog</property>
@@ -15,14 +13,9 @@
         <style>
           <class name="dialog-vbox"/>
         </style>
-
-        <!-- This is empty here and just exists so we can expose it as
-             GtkDialog API. -->
         <child>
-          <object class="GtkBox" id="content_area">
-          </object>
+          <object class="GtkBox" id="content_area"/>
         </child>
-
         <child>
           <object class="GtkBox" id="action_box">
             <style>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index 4cbc604fc2..01bf36c081 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkEmojiChooser" parent="GtkPopover">
-    <property name="modal">1</property>
     <style>
       <class name="emoji-picker"/>
     </style>
@@ -17,333 +15,335 @@
         <child>
           <object class="GtkStack" id="stack">
             <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolled_window">
-                    <property name="vexpand">1</property>
-                    <property name="hscrollbar-policy">never</property>
-                    <property name="min-content-height">250</property>
-                    <style>
-                      <class name="view"/>
-                    </style>
-                    <child>
-                      <object class="GtkBox" id="emoji_box">
-                        <property name="orientation">vertical</property>
-                        <property name="margin">6</property>
-                        <property name="spacing">6</property>
-                        <!-- Remember to keep headings here in sync with button tooltips below -->
-                        <child>
-                          <object class="GtkFlowBox" id="recent.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                            <child>
-                              <object class="GtkGestureLongPress">
-                                <signal name="pressed" handler="long_pressed_cb"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGestureMultiPress">
-                                <property name="button">3</property>
-                                <signal name="pressed" handler="pressed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="people.heading">
-                            <property name="label" translatable="yes" context="emoji category">Smileys &amp; People</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="people.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                            <child>
-                              <object class="GtkGestureLongPress">
-                                <signal name="pressed" handler="long_pressed_cb"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGestureMultiPress">
-                                <property name="button">3</property>
-                                <signal name="pressed" handler="pressed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="body.heading">
-                            <property name="label" translatable="yes" context="emoji category">Body &amp; Clothing</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="body.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                            <child>
-                              <object class="GtkGestureLongPress">
-                                <signal name="pressed" handler="long_pressed_cb"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGestureMultiPress">
-                                <property name="button">3</property>
-                                <signal name="pressed" handler="pressed_cb"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="nature.heading">
-                            <property name="label" translatable="yes" context="emoji category">Animals &amp; Nature</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="nature.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="food.heading">
-                            <property name="label" translatable="yes" context="emoji category">Food &amp; Drink</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="food.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="travel.heading">
-                            <property name="label" translatable="yes" context="emoji category">Travel &amp; Places</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="travel.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="activities.heading">
-                            <property name="label" translatable="yes" context="emoji category">Activities</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="activities.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="objects.heading">
-                            <property name="label" translatable="yes" context="emoji category">Objects</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="objects.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="symbols.heading">
-                            <property name="label" translatable="yes" context="emoji category">Symbols</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="symbols.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="flags.heading">
-                            <property name="label" translatable="yes" context="emoji category">Flags</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="flags.box">
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <!-- Remember to keep tooltips here in sync with section headings above -->
-                    <child>
-                      <object class="GtkButton" id="recent.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Recent</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="people.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Smileys &amp; People</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="body.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Body &amp; Clothing</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="nature.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Animals &amp; Nature</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="food.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Food &amp; Drink</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="travel.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Travel &amp; Places</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="activities.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Activities</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="objects.button">
-                        <property name="relief">none</property>
-                         <property name="tooltip-text" translatable="yes" context="emoji category">Objects</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="symbols.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Symbols</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="flags.button">
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes" context="emoji category">Flags</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">list</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolled_window">
+                        <property name="vexpand">1</property>
+                        <property name="hscrollbar-policy">never</property>
+                        <property name="min-content-height">250</property>
+                        <style>
+                          <class name="view"/>
+                        </style>
+                        <child>
+                          <object class="GtkBox" id="emoji_box">
+                            <property name="orientation">vertical</property>
+                            <property name="margin">6</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkFlowBox" id="recent.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                                <child>
+                                  <object class="GtkGestureLongPress">
+                                    <signal name="pressed" handler="long_pressed_cb"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGestureMultiPress">
+                                    <property name="button">3</property>
+                                    <signal name="pressed" handler="pressed_cb"/>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="people.heading">
+                                <property name="label" translatable="yes" context="emoji category">Smileys &amp; People</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="people.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                                <child>
+                                  <object class="GtkGestureLongPress">
+                                    <signal name="pressed" handler="long_pressed_cb"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGestureMultiPress">
+                                    <property name="button">3</property>
+                                    <signal name="pressed" handler="pressed_cb"/>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="body.heading">
+                                <property name="label" translatable="yes" context="emoji category">Body &amp; Clothing</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="body.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                                <child>
+                                  <object class="GtkGestureLongPress">
+                                    <signal name="pressed" handler="long_pressed_cb"/>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGestureMultiPress">
+                                    <property name="button">3</property>
+                                    <signal name="pressed" handler="pressed_cb"/>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="nature.heading">
+                                <property name="label" translatable="yes" context="emoji category">Animals &amp; Nature</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="nature.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="food.heading">
+                                <property name="label" translatable="yes" context="emoji category">Food &amp; Drink</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="food.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="travel.heading">
+                                <property name="label" translatable="yes" context="emoji category">Travel &amp; Places</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="travel.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="activities.heading">
+                                <property name="label" translatable="yes" context="emoji category">Activities</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="activities.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="objects.heading">
+                                <property name="label" translatable="yes" context="emoji category">Objects</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="objects.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="symbols.heading">
+                                <property name="label" translatable="yes" context="emoji category">Symbols</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="symbols.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="flags.heading">
+                                <property name="label" translatable="yes" context="emoji category">Flags</property>
+                                <property name="xalign">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkFlowBox" id="flags.box">
+                                <property name="homogeneous">1</property>
+                                <property name="selection-mode">none</property>
+                                <signal name="child-activated" handler="emoji_activated"/>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkButton" id="recent.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Recent</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="people.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Smileys &amp; People</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="body.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Body &amp; Clothing</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="nature.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Animals &amp; Nature</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="food.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Food &amp; Drink</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="travel.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Travel &amp; Places</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="activities.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Activities</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="objects.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Objects</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="symbols.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Symbols</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="flags.button">
+                            <property name="relief">none</property>
+                            <property name="tooltip-text" translatable="yes" context="emoji category">Flags</property>
+                            <style>
+                              <class name="emoji-section"/>
+                            </style>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkGrid">
-                <property name="row-spacing">12</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">edit-find-symbolic</property>
-                    <property name="pixel-size">72</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">No Results Found</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="scale" value="1.44"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Try a different search</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">empty</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkGrid">
+                    <property name="row-spacing">12</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="icon-name">edit-find-symbolic</property>
+                        <property name="pixel-size">72</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">No Results Found</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"></attribute>
+                          <attribute name="scale" value="1.44"></attribute>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Try a different search</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui
index f7a5e1baea..964b4bf26c 100644
--- a/gtk/ui/gtkemojicompletion.ui
+++ b/gtk/ui/gtkemojicompletion.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkEmojiCompletion" parent="GtkPopover">
     <property name="modal">0</property>
@@ -8,7 +7,6 @@
     <child>
       <object class="GtkListBox" id="list">
         <property name="selection-mode">none</property>
-        <property name="activate-on-single-click">1</property>
         <signal name="row-activated" handler="row_activated"/>
       </object>
     </child>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 6ae9756c4f..7f0663701e 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFileChooserDialog" parent="GtkDialog">
     <property name="role">GtkFileChooserDialog</property>
     <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 2481eb8860..726c32ee78 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
-  <!-- interface-requires gtkprivate 3.10 -->
   <template class="GtkFileChooserWidget" parent="GtkWidget">
     <child>
       <object class="GtkBox" id="box">
@@ -48,60 +45,66 @@
                               <object class="GtkStack" id="browse_header_stack">
                                 <property name="transition-type">crossfade</property>
                                 <child>
-                                  <object class="GtkBox">
-                                    <property name="spacing">6</property>
-                                    <property name="margin">6</property>
-                                    <child>
-                                      <object class="GtkPathBar" id="browse_path_bar">
-                                        <property name="hexpand">1</property>
-                                        <signal name="path-clicked" handler="path_bar_clicked" after="yes" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkMenuButton" id="browse_new_folder_button">
-                                        <property name="tooltip-text" translatable="yes">Create Folder</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="popover">new_folder_popover</property>
-                                        <property name="icon-name">folder-new-symbolic</property>
-                                        <signal name="notify::active" handler="new_folder_popover_active"/>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
+                                  <object class="GtkStackPage">
                                     <property name="name">pathbar</property>
-                                  </packing>
+                                    <property name="child">
+                                      <object class="GtkBox">
+                                        <property name="spacing">6</property>
+                                        <property name="margin">6</property>
+                                        <child>
+                                          <object class="GtkPathBar" id="browse_path_bar">
+                                            <property name="hexpand">1</property>
+                                            <signal name="path-clicked" handler="path_bar_clicked" after="yes" swapped="no"/>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuButton" id="browse_new_folder_button">
+                                            <property name="tooltip-text" translatable="yes">Create Folder</property>
+                                            <property name="use-underline">1</property>
+                                            <property name="popover">new_folder_popover</property>
+                                            <property name="icon-name">folder-new-symbolic</property>
+                                            <signal name="notify::active" handler="new_folder_popover_active"/>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </property>
+                                  </object>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="location_entry_box">
-                                    <property name="spacing">6</property>
-                                    <property name="margin">6</property>
-                                  </object>
-                                  <packing>
+                                  <object class="GtkStackPage">
                                     <property name="name">location</property>
-                                  </packing>
+                                    <property name="child">
+                                      <object class="GtkBox" id="location_entry_box">
+                                        <property name="spacing">6</property>
+                                        <property name="margin">6</property>
+                                      </object>
+                                    </property>
+                                  </object>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" id="search_entry_box">
-                                    <property name="spacing">6</property>
-                                    <property name="margin">6</property>
-                                    <child>
-                                      <object class="GtkSearchEntry" id="search_entry">
-                                        <property name="width-chars">45</property>
-                                        <property name="hexpand">1</property>
-                                        <property name="halign">center</property>
-                                        <signal name="search-changed" handler="search_entry_activate_cb" swapped="yes"/>
-                                        <signal name="stop-search" handler="search_entry_stop_cb" swapped="yes"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinner" id="search_spinner">
-                                        <property name="visible">0</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
+                                  <object class="GtkStackPage">
                                     <property name="name">search</property>
-                                  </packing>
+                                    <property name="child">
+                                      <object class="GtkBox" id="search_entry_box">
+                                        <property name="spacing">6</property>
+                                        <property name="margin">6</property>
+                                        <child>
+                                          <object class="GtkSearchEntry" id="search_entry">
+                                            <property name="width-chars">45</property>
+                                            <property name="hexpand">1</property>
+                                            <property name="halign">center</property>
+                                            <signal name="search-changed" handler="search_entry_activate_cb" swapped="yes"/>
+                                            <signal name="stop-search" handler="search_entry_stop_cb" swapped="yes"/>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinner" id="search_spinner">
+                                            <property name="visible">0</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </property>
+                                  </object>
                                 </child>
                               </object>
                             </child>
@@ -121,195 +124,201 @@
                               <class name="view"/>
                             </style>
                             <child>
-                              <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="browse_files_swin">
-                                    <property name="hscrollbar-policy">never</property>
-                                    <property name="vexpand">1</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="browse_files_tree_view">
-                                        <property name="has-tooltip">1</property>
-                                        <property name="enable-search">0</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject" id="browse_files_tree_view-atkobject">
-                                            <property name="AtkObject::accessible-name" translatable="yes">Files</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkGestureLongPress">
-                                            <property name="touch-only">True</property>
-                                            <signal name="pressed" handler="long_press_cb" swapped="no"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkGestureMultiPress">
-                                            <property name="button">3</property>
-                                            <signal name="pressed" handler="multi_press_cb" swapped="no"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEventControllerKey">
-                                            <signal name="key-pressed" handler="key_press_cb" swapped="no"/>
-                                          </object>
-                                        </child>
-                                        <signal name="drag-data-received" handler="file_list_drag_data_received_cb" swapped="no"/>
-                                        <signal name="drag-drop" handler="file_list_drag_drop_cb" swapped="no"/>
-                                        <signal name="drag-begin" handler="file_list_drag_begin_cb" swapped="no"/>
-                                        <signal name="drag-motion" handler="file_list_drag_motion_cb" swapped="no"/>
-                                        <signal name="drag-end" handler="file_list_drag_end_cb" swapped="no"/>
-                                        <signal name="popup-menu" handler="list_popup_menu_cb" swapped="no"/>
-                                        <signal name="query-tooltip" handler="file_list_query_tooltip_cb" swapped="no"/>
-                                        <signal name="row-activated" handler="list_row_activated" swapped="no"/>
-                                        <signal name="cursor-changed" handler="list_cursor_changed" swapped="no"/>
-                                        <child internal-child="selection">
-                                          <object class="GtkTreeSelection" id="treeview-selection2">
-                                            <signal name="changed" handler="list_selection_changed" swapped="no"/>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="list_name_column">
-                                            <property name="title" translatable="yes">Name</property>
-                                            <property name="resizable">1</property>
-                                            <property name="expand">1</property>
-                                            <child>
-                                              <object class="GtkCellRendererPixbuf" id="list_pixbuf_renderer">
-                                                <property name="xpad">6</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="list_name_renderer">
-                                                <property name="width-chars">10</property>
-                                                <property name="ellipsize">end</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="list_location_column">
-                                            <property name="title" translatable="yes">Location</property>
-                                            <property name="resizable">1</property>
-                                            <property name="visible">0</property>
-                                            <property name="expand">1</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="list_location_renderer">
-                                                <property name="xalign">0</property>
-                                                <property name="width-chars">10</property>
-                                                <property name="ellipsize">start</property>
-                                                <property name="xpad">6</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="list_size_column">
-                                            <property name="title" translatable="yes">Size</property>
-                                            <property name="sizing">fixed</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="list_size_renderer">
-                                                <property name="xalign">0</property>
-                                                <property name="xpad">6</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="list_time_column">
-                                            <property name="title" translatable="yes">Modified</property>
-                                            <property name="sizing">fixed</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="list_date_renderer">
-                                                <property name="xpad">6</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="list_time_renderer">
-                                                <property name="xpad">6</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkActionBar" id="remote_warning_bar">
-                                    <property name="visible">0</property>
-                                    <child type="center">
-                                      <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Remote location — only searching the current folder</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
+                              <object class="GtkStackPage">
                                 <property name="name">list</property>
-                              </packing>
+                                <property name="child">
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkScrolledWindow" id="browse_files_swin">
+                                        <property name="hscrollbar-policy">never</property>
+                                        <property name="vexpand">1</property>
+                                        <child>
+                                          <object class="GtkTreeView" id="browse_files_tree_view">
+                                            <property name="has-tooltip">1</property>
+                                            <property name="enable-search">0</property>
+                                            <child internal-child="accessible">
+                                              <object class="AtkObject" id="browse_files_tree_view-atkobject">
+                                                <property name="AtkObject::accessible-name" translatable="yes">Files</property>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkGestureLongPress">
+                                                <property name="touch-only">True</property>
+                                                <signal name="pressed" handler="long_press_cb" swapped="no"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkGestureMultiPress">
+                                                <property name="button">3</property>
+                                                <signal name="pressed" handler="multi_press_cb" swapped="no"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkEventControllerKey">
+                                                <signal name="key-pressed" handler="key_press_cb" swapped="no"/>
+                                              </object>
+                                            </child>
+                                            <signal name="drag-data-received" handler="file_list_drag_data_received_cb" swapped="no"/>
+                                            <signal name="drag-drop" handler="file_list_drag_drop_cb" swapped="no"/>
+                                            <signal name="drag-begin" handler="file_list_drag_begin_cb" swapped="no"/>
+                                            <signal name="drag-motion" handler="file_list_drag_motion_cb" swapped="no"/>
+                                            <signal name="drag-end" handler="file_list_drag_end_cb" swapped="no"/>
+                                            <signal name="popup-menu" handler="list_popup_menu_cb" swapped="no"/>
+                                            <signal name="query-tooltip" handler="file_list_query_tooltip_cb" swapped="no"/>
+                                            <signal name="row-activated" handler="list_row_activated" swapped="no"/>
+                                            <signal name="cursor-changed" handler="list_cursor_changed" swapped="no"/>
+                                            <child internal-child="selection">
+                                              <object class="GtkTreeSelection" id="treeview-selection2">
+                                                <signal name="changed" handler="list_selection_changed" swapped="no"/>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkTreeViewColumn" id="list_name_column">
+                                                <property name="title" translatable="yes">Name</property>
+                                                <property name="resizable">1</property>
+                                                <property name="expand">1</property>
+                                                <child>
+                                                  <object class="GtkCellRendererPixbuf" id="list_pixbuf_renderer">
+                                                    <property name="xpad">6</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCellRendererText" id="list_name_renderer">
+                                                    <property name="width-chars">10</property>
+                                                    <property name="ellipsize">end</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkTreeViewColumn" id="list_location_column">
+                                                <property name="title" translatable="yes">Location</property>
+                                                <property name="resizable">1</property>
+                                                <property name="visible">0</property>
+                                                <property name="expand">1</property>
+                                                <child>
+                                                  <object class="GtkCellRendererText" id="list_location_renderer">
+                                                    <property name="xalign">0</property>
+                                                    <property name="width-chars">10</property>
+                                                    <property name="ellipsize">start</property>
+                                                    <property name="xpad">6</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkTreeViewColumn" id="list_size_column">
+                                                <property name="title" translatable="yes">Size</property>
+                                                <property name="sizing">fixed</property>
+                                                <child>
+                                                  <object class="GtkCellRendererText" id="list_size_renderer">
+                                                    <property name="xalign">0</property>
+                                                    <property name="xpad">6</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child>
+                                              <object class="GtkTreeViewColumn" id="list_time_column">
+                                                <property name="title" translatable="yes">Modified</property>
+                                                <property name="sizing">fixed</property>
+                                                <child>
+                                                  <object class="GtkCellRendererText" id="list_date_renderer">
+                                                    <property name="xpad">6</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCellRendererText" id="list_time_renderer">
+                                                    <property name="xpad">6</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkActionBar" id="remote_warning_bar">
+                                        <property name="visible">0</property>
+                                        <child type="center">
+                                          <object class="GtkLabel">
+                                            <property name="label" translatable="yes">Remote location — only searching the current folder</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </property>
+                              </object>
                             </child>
                             <child>
-                              <object class="GtkPlacesView" id="places_view">
-                                <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>
-                              <packing>
+                              <object class="GtkStackPage">
                                 <property name="name">other_locations</property>
-                              </packing>
+                                <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>
+                                    <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>
+                                </property>
+                              </object>
                             </child>
                             <child>
-                              <object class="GtkGrid">
-                                <property name="row-spacing">12</property>
-                                <property name="hexpand">1</property>
-                                <property name="vexpand">1</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <style>
-                                  <class name="dim-label"/>
-                                </style>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="icon-name">edit-find-symbolic</property>
-                                    <property name="pixel-size">72</property>
-                                    <style>
-                                      <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">No Results Found</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.44"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Try a different search</property>
-                                    <style>
-                                      <class name="dim-label"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
+                              <object class="GtkStackPage">
                                 <property name="name">empty</property>
-                              </packing>
+                                <property name="child">
+                                  <object class="GtkGrid">
+                                    <property name="row-spacing">12</property>
+                                    <property name="hexpand">1</property>
+                                    <property name="vexpand">1</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="icon-name">edit-find-symbolic</property>
+                                        <property name="pixel-size">72</property>
+                                        <style>
+                                          <class name="dim-label"/>
+                                        </style>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label" translatable="yes">No Results Found</property>
+                                        <attributes>
+                                          <attribute name="weight" value="bold"></attribute>
+                                          <attribute name="scale" value="1.44"></attribute>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label" translatable="yes">Try a different search</property>
+                                        <style>
+                                          <class name="dim-label"/>
+                                        </style>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="top-attach">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                </property>
+                              </object>
                             </child>
                           </object>
                         </child>
@@ -341,7 +350,6 @@
             </child>
             <child>
               <object class="GtkBox" id="filter_combo_hbox">
-                <!--<property name="spacing">12</property>-->
                 <child>
                   <object class="GtkComboBoxText" id="filter_combo">
                     <property name="tooltip-text" translatable="yes">Select which types of files are shown</property>
@@ -386,7 +394,7 @@
             <property name="halign">start</property>
             <property name="mnemonic-widget">new_folder_name_entry</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
           <packing>
@@ -446,7 +454,7 @@
             <property name="halign">start</property>
             <property name="mnemonic-widget">rename_file_name_entry</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
           <packing>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index e94b52e539..be72f3908c 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Font</property>
     <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 4adfa0999a..5d06c53cd2 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="model">
     <columns>
-      <!-- column-name family -->
       <column type="PangoFontFamily"/>
-      <!-- column-name face -->
       <column type="PangoFontFace"/>
-      <!-- column-name description -->
       <column type="GtkDelayedFontDescription"/>
-      <!-- column-name preview-title -->
       <column type="gchararray"/>
     </columns>
   </object>
@@ -34,283 +28,291 @@
     <child>
       <object class="GtkStack" id="stack">
         <child>
-          <object class="GtkGrid" id="grid">
-            <property name="row-spacing">6</property>
-            <property name="column-spacing">6</property>
-            <child>
-              <object class="GtkSearchEntry" id="search_entry">
-                <property name="can-focus">1</property>
-                <property name="hexpand">1</property>
-                <property name="activates-default">1</property>
-                <property name="primary-icon-name">edit-find-symbolic</property>
-                <property name="primary-icon-activatable">0</property>
-                <property name="secondary-icon-activatable">0</property>
-                <property name="primary-icon-sensitive">0</property>
-                <property name="secondary-icon-sensitive">0</property>
-                <property name="placeholder-text" translatable="yes">Search font name</property>
-                <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
-                <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkStack" id="list_stack">
+          <object class="GtkStackPage">
+            <property name="name">list</property>
+            <property name="child">
+              <object class="GtkGrid" id="grid">
+                <property name="row-spacing">6</property>
+                <property name="column-spacing">6</property>
                 <child>
-                  <object class="GtkGrid" id="font_grid">
-                    <property name="row-spacing">6</property>
-                    <property name="column-spacing">6</property>
+                  <object class="GtkSearchEntry" id="search_entry">
+                    <property name="can-focus">1</property>
+                    <property name="hexpand">1</property>
+                    <property name="activates-default">1</property>
+                    <property name="primary-icon-name">edit-find-symbolic</property>
+                    <property name="primary-icon-activatable">0</property>
+                    <property name="secondary-icon-activatable">0</property>
+                    <property name="primary-icon-sensitive">0</property>
+                    <property name="secondary-icon-sensitive">0</property>
+                    <property name="placeholder-text" translatable="yes">Search font name</property>
+                    <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
+                    <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkStack" id="list_stack">
                     <child>
-                      <object class="GtkScrolledWindow" id="list_scrolled_window">
-                        <property name="width-request">400</property>
-                        <property name="height-request">300</property>
-                        <property name="can-focus">1</property>
-                        <property name="hexpand">1</property>
-                        <property name="vexpand">1</property>
-                        <property name="hscrollbar-policy">never</property>
-                        <property name="shadow-type">etched-in</property>
-                        <child>
-                          <object class="GtkTreeView" id="family_face_list">
-                            <property name="can-focus">1</property>
-                            <property name="model">filter_model</property>
-                            <property name="headers-visible">0</property>
-                            <property name="enable-search">0</property>
-                            <property name="fixed-height-mode">1</property>
-                            <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
-                            <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
-                            <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" object="GtkFontChooserWidget" after="yes" swapped="yes"/>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection1">
-                                <property name="mode">browse</property>
-                                <signal name="changed" handler="selection_changed"/>
-                              </object>
-                            </child>
+                      <object class="GtkStackPage">
+                        <property name="name">list</property>
+                        <property name="child">
+                          <object class="GtkGrid" id="font_grid">
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">6</property>
                             <child>
-                              <object class="GtkTreeViewColumn" id="family_face_column">
-                                <property name="sizing">fixed</property>
-                                <property name="title" translatable="yes">Font Family</property>
+                              <object class="GtkScrolledWindow" id="list_scrolled_window">
+                                <property name="width-request">400</property>
+                                <property name="height-request">300</property>
+                                <property name="can-focus">1</property>
+                                <property name="hexpand">1</property>
+                                <property name="vexpand">1</property>
+                                <property name="hscrollbar-policy">never</property>
+                                <property name="shadow-type">etched-in</property>
                                 <child>
-                                  <object class="GtkCellRendererText" id="family_face_cell">
-                                    <property name="ellipsize">end</property>
+                                  <object class="GtkTreeView" id="family_face_list">
+                                    <property name="can-focus">1</property>
+                                    <property name="model">filter_model</property>
+                                    <property name="headers-visible">0</property>
+                                    <property name="enable-search">0</property>
+                                    <property name="fixed-height-mode">1</property>
+                                    <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
+                                    <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
+                                    <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" object="GtkFontChooserWidget" after="yes" swapped="yes"/>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection1">
+                                        <property name="mode">browse</property>
+                                        <signal name="changed" handler="selection_changed"/>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="family_face_column">
+                                        <property name="sizing">fixed</property>
+                                        <property name="title" translatable="yes">Font Family</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="family_face_cell">
+                                            <property name="ellipsize">end</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
+                                <property name="width">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="preview">
+                                <property name="can-focus">1</property>
+                                <property name="placeholder-text" translatable="yes">Preview text</property>
+                                <child>
+                                  <object class="GtkEventControllerScroll">
+                                    <property name="flags" translatable="yes">horizontal</property>
+                                    <signal name="scroll" handler="resize_by_scroll_cb"/>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">2</property>
+                                <property name="width">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="size_label">
+                                <property name="label" translatable="yes">Size</property>
+                                <property name="xalign">0</property>
+                                <property name="valign">baseline</property>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScale" id="size_slider">
+                                <property name="can-focus">1</property>
+                                <property name="hexpand">1</property>
+                                <property name="adjustment">slider_adjustment</property>
+                                <property name="draw-value">0</property>
+                                <property name="round-digits">0</property>
+                                <child>
+                                  <object class="GtkEventControllerScroll">
+                                    <property name="flags" translatable="yes">horizontal</property>
+                                    <signal name="scroll" handler="resize_by_scroll_cb"/>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="size_spin">
+                                <property name="can-focus">1</property>
+                                <property name="adjustment">spin_adjustment</property>
+                                <property name="valign">center</property>
+                                <signal name="output" handler="output_cb"/>
+                              </object>
+                              <packing>
+                                <property name="left-attach">2</property>
+                                <property name="top-attach">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="name">empty</property>
+                        <property name="child">
+                          <object class="GtkGrid">
+                            <property name="row-spacing">12</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">1</property>
+                            <property name="halign">center</property>
+                            <property name="valign">center</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="gicon">fonticon</property>
+                                <property name="pixel-size">64</property>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">No Fonts Found</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"></attribute>
+                                  <attribute name="scale" value="1.2"></attribute>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+              </object>
+            </property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkStackPage">
+            <property name="name">tweaks</property>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="font_name_label">
+                    <property name="margin-top">6</property>
+                    <property name="margin-bottom">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="ellipsize">end</property>
+                    <property name="xalign">0</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="preview2">
+                    <property name="can-focus">1</property>
+                    <property name="placeholder-text" translatable="yes">Preview text</property>
+                    <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"></property>
+                    <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"></property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="hscrollbar-policy">never</property>
+                    <property name="shadow-type">in</property>
+                    <property name="vexpand">1</property>
+                    <style>
+                      <class name="view"/>
+                    </style>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
+                        <property name="margin">12</property>
+                        <child>
+                          <object class="GtkGrid" id="axis_grid">
+                            <property name="row-spacing">6</property>
+                            <property name="column-spacing">12</property>
+                            <child>
+                              <object class="GtkLabel" id="size_label2">
+                                <property name="label" translatable="yes">Size</property>
+                                <property name="xalign">0</property>
+                                <property name="valign">baseline</property>
+                              </object>
+                              <packing>
+                                <property name="left-attach">0</property>
+                                <property name="top-attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScale" id="size_slider2">
+                                <property name="can-focus">1</property>
+                                <property name="hexpand">1</property>
+                                <property name="adjustment">slider_adjustment</property>
+                                <property name="draw-value">0</property>
+                                <property name="round-digits">0</property>
+                              </object>
+                              <packing>
+                                <property name="left-attach">1</property>
+                                <property name="top-attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="size_spin2">
+                                <property name="can-focus">1</property>
+                                <property name="adjustment">spin_adjustment</property>
+                                <property name="valign">center</property>
+                                <signal name="output" handler="output_cb"/>
+                              </object>
+                              <packing>
+                                <property name="left-attach">2</property>
+                                <property name="top-attach">0</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                        <property name="width">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="preview">
-                        <property name="can-focus">1</property>
-                        <property name="placeholder-text" translatable="yes">Preview text</property>
                         <child>
-                          <object class="GtkEventControllerScroll">
-                            <property name="flags" translatable="yes">horizontal</property>
-                            <signal name="scroll" handler="resize_by_scroll_cb"/>
+                          <object class="GtkBox" id="feature_box">
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                        <property name="width">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="size_label">
-                        <property name="label" translatable="yes">Size</property>
-                        <property name="xalign">0</property>
-                        <property name="valign">baseline</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScale" id="size_slider">
-                        <property name="can-focus">1</property>
-                        <property name="hexpand">1</property>
-                        <property name="adjustment">slider_adjustment</property>
-                        <property name="draw-value">0</property>
-                        <property name="round-digits">0</property>
-                        <child>
-                          <object class="GtkEventControllerScroll">
-                            <property name="flags" translatable="yes">horizontal</property>
-                            <signal name="scroll" handler="resize_by_scroll_cb"/>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="size_spin">
-                        <property name="can-focus">1</property>
-                        <property name="adjustment">spin_adjustment</property>
-                        <property name="valign">center</property>
-                        <signal name="output" handler="output_cb"/>
-                      </object>
-                      <packing>
-                        <property name="left-attach">2</property>
-                        <property name="top-attach">3</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="name">list</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid">
-                    <property name="row-spacing">12</property>
-                    <property name="hexpand">1</property>
-                    <property name="vexpand">1</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="gicon">fonticon</property>
-                        <property name="pixel-size">64</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">No Fonts Found</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1.2"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="name">empty</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
+            </property>
           </object>
-          <packing>
-            <property name="name">list</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="font_name_label">
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-end">12</property>
-                <property name="ellipsize">end</property>
-                <property name="xalign">0</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkEntry" id="preview2">
-                <property name="can-focus">1</property>
-                <property name="placeholder-text" translatable="yes">Preview text</property>
-                <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"/>
-                <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="hscrollbar-policy">never</property>
-                <property name="shadow-type">in</property>
-                <property name="vexpand">1</property>
-                <style>
-                  <class name="view"/>
-                </style>
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">12</property>
-                    <property name="margin">12</property>
-                    <child>
-                      <object class="GtkGrid" id="axis_grid">
-                        <property name="row-spacing">6</property>
-                        <property name="column-spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="size_label2">
-                            <property name="label" translatable="yes">Size</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkScale" id="size_slider2">
-                            <property name="can-focus">1</property>
-                            <property name="hexpand">1</property>
-                            <property name="adjustment">slider_adjustment</property>
-                            <property name="draw-value">0</property>
-                            <property name="round-digits">0</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="size_spin2">
-                            <property name="can-focus">1</property>
-                            <property name="adjustment">spin_adjustment</property>
-                            <property name="valign">center</property>
-                            <signal name="output" handler="output_cb"/>
-                          </object>
-                          <packing>
-                            <property name="left-attach">2</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="feature_box">
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">12</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="name">tweaks</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 5e2f42f50c..2dcc1a6aab 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkInfoBar" parent="GtkBox">
     <child>
       <object class="GtkRevealer" id="revealer">
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index 27973f02c5..328c02ff07 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.6 -->
   <template class="GtkLockButton" parent="GtkButton">
     <property name="can-focus">1</property>
     <property name="receives-default">1</property>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index 895259dc50..9a32138682 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkAdjustment" id="time_adjustment">
     <property name="upper">10</property>
     <property name="step-increment">1</property>
@@ -17,7 +15,6 @@
   <template class="GtkMediaControls" parent="GtkWidget">
     <child>
       <object class="GtkBox" id="box">
-        <property name="hexpand">0</property>
         <property name="sensitive">0</property>
         <property name="spacing">6</property>
         <child>
@@ -33,9 +30,7 @@
         <child>
           <object class="GtkBox" id="time_box">
             <child>
-              <object class="GtkLabel" id="time_label">
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkLabel" id="time_label"/>
             </child>
             <child>
               <object class="GtkScale" id="seek_scale">
@@ -47,9 +42,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkLabel" id="duration_label">
-                <property name="can_focus">False</property>
-              </object>
+              <object class="GtkLabel" id="duration_label"/>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 07a4236638..61f1b3d095 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkMessageDialog" parent="GtkDialog">
     <property name="title"></property>
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 759c65829a..b369450dab 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -1,25 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkListStore" id="custom_paper_list">
     <columns>
-      <!-- column-name paper -->
       <column type="GObject"/>
     </columns>
   </object>
   <object class="GtkListStore" id="page_setup_list">
     <columns>
-      <!-- column-name page-setup -->
       <column type="GObject"/>
-      <!-- column-name is-separator -->
       <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkListStore" id="printer_list">
     <columns>
-      <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name printer -->
       <column type="GObject"/>
     </columns>
   </object>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index 5fb0efec30..be2fe80905 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkButton" id="down_slider_button">
     <property name="can-focus">1</property>
     <property name="receives-default">1</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 5ae7a794cf..b621e08fb2 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="completion_store">
     <columns>
-      <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name uri -->
       <column type="gchararray"/>
     </columns>
   </object>
@@ -27,7 +24,7 @@
             <property name="hexpand">1</property>
             <property name="label" translatable="yes">Server Addresses</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
             <style>
               <class name="dim-label"/>
@@ -66,7 +63,7 @@
                 <property name="label" translatable="yes">Available Protocols</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="weight" value="bold"/>
+                  <attribute name="weight" value="bold"></attribute>
                 </attributes>
               </object>
               <packing>
@@ -79,7 +76,7 @@
                 <property name="label" translatable="yes">Prefix</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="weight" value="bold"/>
+                  <attribute name="weight" value="bold"></attribute>
                 </attributes>
               </object>
               <packing>
@@ -96,146 +93,153 @@
     <child>
       <object class="GtkStack" id="recent_servers_stack">
         <child>
-          <object class="GtkBox">
-            <property name="vexpand">1</property>
-            <property name="valign">center</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">18</property>
-            <child>
-              <object class="GtkImage">
-                <property name="pixel-size">48</property>
-                <property name="icon-name">network-server-symbolic</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label" translatable="yes" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">empty</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="vexpand">1</property>
+                <property name="valign">center</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">18</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="pixel-size">48</property>
+                    <property name="icon-name">network-server-symbolic</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
-            <property name="margin">12</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label" translatable="yes">Recent Servers</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="can-focus">1</property>
-                <property name="vexpand">1</property>
-                <property name="shadow-type">in</property>
-                <property name="min-content-width">250</property>
-                <property name="min-content-height">200</property>
+          <object class="GtkStackPage">
+            <property name="name">list</property>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <property name="margin">12</property>
                 <child>
-                  <object class="GtkViewport">
-                    <property name="shadow-type">none</property>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Recent Servers</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"></attribute>
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="can-focus">1</property>
+                    <property name="vexpand">1</property>
+                    <property name="shadow-type">in</property>
+                    <property name="min-content-width">250</property>
+                    <property name="min-content-height">200</property>
                     <child>
-                      <object class="GtkListBox" id="recent_servers_listbox">
-                        <property name="can-focus">1</property>
-                        <property name="selection-mode">none</property>
-                        <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
+                      <object class="GtkViewport">
+                        <property name="shadow-type">none</property>
+                        <child>
+                          <object class="GtkListBox" id="recent_servers_listbox">
+                            <property name="can-focus">1</property>
+                            <property name="selection-mode">none</property>
+                            <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-            </child>
+            </property>
           </object>
-          <packing>
-            <property name="name">list</property>
-          </packing>
         </child>
       </object>
     </child>
   </object>
   <template class="GtkPlacesView" parent="GtkBox">
-    <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkStack" id="stack">
         <property name="vhomogeneous">0</property>
         <property name="transition-type">crossfade</property>
         <child>
-          <object class="GtkFrame">
-            <property name="shadow-type">none</property>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
+          <object class="GtkStackPage">
+            <property name="name">browse</property>
+            <property name="child">
+              <object class="GtkFrame">
+                <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkViewport">
-                    <property name="shadow-type">none</property>
+                  <object class="GtkScrolledWindow">
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
                     <child>
-                      <object class="GtkListBox" id="listbox">
-                        <property name="can-focus">1</property>
-                        <property name="selection-mode">none</property>
-                        <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
+                      <object class="GtkViewport">
+                        <property name="shadow-type">none</property>
+                        <child>
+                          <object class="GtkListBox" id="listbox">
+                            <property name="can-focus">1</property>
+                            <property name="selection-mode">none</property>
+                            <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-            </child>
+            </property>
           </object>
-          <packing>
-            <property name="name">browse</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkImage">
-                <property name="pixel-size">72</property>
-                <property name="icon-name">edit-find-symbolic</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label" translatable="yes">No results found</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                  <attribute name="scale" value="1.44"/>
-                </attributes>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label" translatable="yes">Try a different search</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-          </object>
-          <packing>
+          <object class="GtkStackPage">
             <property name="name">empty-search</property>
-          </packing>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="pixel-size">72</property>
+                    <property name="icon-name">edit-find-symbolic</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">No results found</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"></attribute>
+                      <attribute name="scale" value="1.44"></attribute>
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Try a different search</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+              </object>
+            </property>
+          </object>
         </child>
       </object>
     </child>
@@ -253,7 +257,7 @@
             <property name="mnemonic-widget">address_entry</property>
             <property name="use-underline">1</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
         </child>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 66611b032d..21045e6069 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
     <property name="width-request">100</property>
-    <property name="visible">True</property>
     <property name="can-focus">True</property>
     <child>
       <object class="GtkBox" id="box">
@@ -46,26 +44,36 @@
         <child>
           <object class="GtkStack" id="mount_stack">
             <child>
-              <object class="GtkButton" id="eject_button">
-                <property name="visible">0</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="tooltip-text" translatable="yes">Unmount</property>
-                <child>
-                  <object class="GtkImage" id="eject_icon">
-                    <property name="icon-name">media-eject-symbolic</property>
+              <object class="GtkStackPage">
+                <property name="name">button</property>
+                <property name="child">
+                  <object class="GtkButton" id="eject_button">
+                    <property name="visible">0</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="tooltip-text" translatable="yes">Unmount</property>
+                    <child>
+                      <object class="GtkImage" id="eject_icon">
+                        <property name="icon-name">media-eject-symbolic</property>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="image-button"/>
+                      <class name="sidebar-button"/>
+                    </style>
                   </object>
-                </child>
-                <style>
-                  <class name="image-button"/>
-                  <class name="sidebar-button"/>
-                </style>
+                </property>
               </object>
             </child>
             <child>
-              <object class="GtkSpinner" id="busy_spinner">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
+              <object class="GtkStackPage">
+                <property name="name">spinner</property>
+                <property name="child">
+                  <object class="GtkSpinner" id="busy_spinner">
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                  </object>
+                </property>
               </object>
             </child>
           </object>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 64952bb605..5a38f69f74 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.6 -->
-  <!-- interface-requires gtkprivate 3.10 -->
   <object class="GtkAdjustment" id="copies_spin_adjustment">
     <property name="lower">1</property>
     <property name="upper">999</property>
@@ -10,31 +7,22 @@
   </object>
   <object class="GtkListStore" id="custom_paper_list">
     <columns>
-      <!-- column-name custom -->
       <column type="GObject"/>
     </columns>
   </object>
   <object class="GtkListStore" id="page_setup_list">
     <columns>
-      <!-- column-name page-setup -->
       <column type="GObject"/>
-      <!-- column-name is-separator -->
       <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkListStore" id="printer_list">
     <columns>
-      <!-- column-name icon -->
       <column type="GIcon"/>
-      <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name state -->
       <column type="gchararray"/>
-      <!-- column-name jobs -->
       <column type="gint"/>
-      <!-- column-name location -->
       <column type="gchararray"/>
-      <!-- column-name printer -->
       <column type="GObject"/>
     </columns>
   </object>
@@ -161,7 +149,7 @@
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes">Range</property>
                                 <attributes>
-                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="weight" value="bold"></attribute>
                                 </attributes>
                                 <accessibility>
                                   <relation type="label-for" target="range_table"/>
@@ -274,7 +262,7 @@
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes">Copies</property>
                                 <attributes>
-                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="weight" value="bold"></attribute>
                                 </attributes>
                                 <accessibility>
                                   <relation type="label-for" target="grid1"/>
@@ -382,7 +370,7 @@
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes">Layout</property>
                                 <attributes>
-                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="weight" value="bold"></attribute>
                                 </attributes>
                                 <accessibility>
                                   <relation type="label-for" target="grid2"/>
@@ -548,7 +536,7 @@
                                 <property name="valign">center</property>
                                 <property name="label" translatable="yes">Paper</property>
                                 <attributes>
-                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="weight" value="bold"></attribute>
                                 </attributes>
                                 <accessibility>
                                   <relation type="label-for" target="grid3"/>
@@ -731,7 +719,7 @@
                             <property name="valign">center</property>
                             <property name="label" translatable="yes">Job Details</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="weight" value="bold"></attribute>
                             </attributes>
                             <accessibility>
                               <relation type="label-for" target="grid5"/>
@@ -804,7 +792,7 @@
                             <property name="valign">center</property>
                             <property name="label" translatable="yes">Print Document</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="weight" value="bold"></attribute>
                             </attributes>
                             <accessibility>
                               <relation type="label-for" target="grid6"/>
@@ -913,7 +901,7 @@
                             <property name="valign">center</property>
                             <property name="label" translatable="yes">Add Cover Page</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="weight" value="bold"></attribute>
                             </attributes>
                             <accessibility>
                               <relation type="label-for" target="grid7"/>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index eee9893403..560ec39def 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
-  <!-- interface-requires gtkprivate 3.10 -->
   <template class="GtkScaleButton" parent="GtkButton">
     <property name="can-focus">1</property>
     <property name="receives-default">1</property>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 6462f9bbdb..d2ebdd2b08 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkSidebarRow" parent="GtkListBoxRow">
     <property name="margin-top">1</property>
@@ -54,7 +53,7 @@
                 </style>
               </object>
             </child>
-	    <child>
+            <child>
               <object class="GtkSpinner" id="busy_spinner">
                 <property name="active">1</property>
                 <property name="halign">center</property>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index f5ae691394..eb0a23d53a 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkStatusbar" parent="GtkWidget">
     <child>
       <object class="GtkFrame" id="frame">
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index 6b0aa18f7f..848d4cedc4 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkTooltipWindow" parent="GtkWindow">
     <property name="resizable">0</property>
     <property name="type-hint">tooltip</property>
diff --git a/gtk/ui/gtkvideo.ui b/gtk/ui/gtkvideo.ui
index 4b16433f70..b4d96563ea 100644
--- a/gtk/ui/gtkvideo.ui
+++ b/gtk/ui/gtkvideo.ui
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.6 -->
   <template class="GtkVideo" parent="GtkWidget">
     <child>
       <object class="GtkOverlay" id="box">
         <child>
-          <object class="GtkPicture" id="video_picture" />
+          <object class="GtkPicture" id="video_picture"/>
         </child>
         <child type="overlay">
           <object class="GtkImage" id="overlay_icon">
@@ -24,7 +22,6 @@
         </child>
         <child type="overlay">
           <object class="GtkRevealer" id="controls_revealer">
-            <property name="reveal-child">0</property>
             <property name="valign">end</property>
             <child>
               <object class="GtkMediaControls" id="controls">
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index ba78c9327b..cd5f3224d1 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkAdjustment" id="adjustment">
     <property name="upper">1</property>
     <property name="step-increment">0.02</property>