From 4ace873046fe7bab6f2678c9307f6e2a28f9ff90 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 7 Feb 2019 03:23:02 -0500
Subject: [PATCH] Update ui files to new stack syntax

This conversion was done with the help of gtk4-builder-tool.
---
 demos/gtk-demo/application.ui          |    4 +-
 demos/gtk-demo/appmenu.ui              |    2 -
 demos/gtk-demo/blendmodes.ui           |  516 +--
 demos/gtk-demo/cursors.ui              |    2 -
 demos/gtk-demo/demo.ui                 |   11 +-
 demos/gtk-demo/filtermodel.ui          |   10 +-
 demos/gtk-demo/fishbowl.ui             |    8 +-
 demos/gtk-demo/font-features.ui        |   44 +-
 demos/gtk-demo/listbox.ui              |    5 +-
 demos/gtk-demo/main.ui                 |   11 +-
 demos/gtk-demo/menus.ui                |    1 -
 demos/gtk-demo/modelbutton.ui          |   11 +-
 demos/gtk-demo/popover.ui              |    4 -
 demos/gtk-demo/revealer.ui             |    2 -
 demos/gtk-demo/scale.ui                |   22 +-
 demos/gtk-demo/shortcuts-boxes.ui      |    9 -
 demos/gtk-demo/shortcuts-builder.ui    |    2 -
 demos/gtk-demo/shortcuts-clocks.ui     |    2 -
 demos/gtk-demo/shortcuts-gedit.ui      |    2 -
 demos/gtk-demo/shortcuts.ui            |    2 -
 demos/gtk-demo/spinbutton.ui           |    1 -
 demos/gtk-demo/stack.ui                |   52 +-
 demos/gtk-demo/theming.ui              |    1 -
 demos/icon-browser/menus.ui            |    2 -
 demos/icon-browser/window.ui           |    6 +-
 demos/widget-factory/widget-factory.ui | 5214 ++++++++++++------------
 examples/application10/app-menu.ui     |    2 -
 examples/application10/gears-menu.ui   |    2 -
 examples/application10/prefs.ui        |    9 +-
 examples/application10/window.ui       |    2 -
 examples/application2/window.ui        |    5 +-
 examples/application3/window.ui        |    5 +-
 examples/application4/app-menu.ui      |    2 -
 examples/application4/window.ui        |    5 +-
 examples/application5/app-menu.ui      |    2 -
 examples/application5/window.ui        |    5 +-
 examples/application6/app-menu.ui      |    2 -
 examples/application6/prefs.ui         |    9 +-
 examples/application6/window.ui        |    5 +-
 examples/application7/app-menu.ui      |    2 -
 examples/application7/prefs.ui         |    9 +-
 examples/application7/window.ui        |    2 -
 examples/application8/app-menu.ui      |    2 -
 examples/application8/gears-menu.ui    |    2 -
 examples/application8/prefs.ui         |    9 +-
 examples/application8/window.ui        |    2 -
 examples/application9/app-menu.ui      |    2 -
 examples/application9/gears-menu.ui    |    2 -
 examples/application9/prefs.ui         |    9 +-
 examples/application9/window.ui        |    2 -
 gtk/inspector/actions.ui               |    1 -
 gtk/inspector/css-editor.ui            |    1 -
 gtk/inspector/css-node-tree.ui         |    1 -
 gtk/inspector/data-list.ui             |    4 +-
 gtk/inspector/general.ui               |    3 -
 gtk/inspector/logs.ui                  |    7 +-
 gtk/inspector/magnifier.ui             |    1 -
 gtk/inspector/menu.ui                  |    6 -
 gtk/inspector/misc-info.ui             |    2 -
 gtk/inspector/object-hierarchy.ui      |    1 -
 gtk/inspector/object-tree.ui           |    2 -
 gtk/inspector/prop-list.ui             |    1 -
 gtk/inspector/recorder.ui              |    3 +-
 gtk/inspector/resource-list.ui         |  439 +-
 gtk/inspector/selector.ui              |    1 -
 gtk/inspector/signals-list.ui          |    1 -
 gtk/inspector/statistics.ui            |  266 +-
 gtk/inspector/visual.ui                |    7 +-
 gtk/inspector/window.ui                |  887 ++--
 gtk/ui/gtkaboutdialog.ui               |  298 +-
 gtk/ui/gtkappchooserdialog.ui          |    2 -
 gtk/ui/gtkappchooserwidget.ui          |   14 +-
 gtk/ui/gtkapplication-quartz.ui        |    8 -
 gtk/ui/gtkassistant.ui                 |    2 -
 gtk/ui/gtkcolorchooserdialog.ui        |    2 -
 gtk/ui/gtkcoloreditor.ui               |    4 -
 gtk/ui/gtkcombobox.ui                  |    2 -
 gtk/ui/gtkdialog.ui                    |    9 +-
 gtk/ui/gtkemojichooser.ui              |  650 +--
 gtk/ui/gtkemojicompletion.ui           |    2 -
 gtk/ui/gtkfilechooserdialog.ui         |    2 -
 gtk/ui/gtkfilechooserwidget.ui         |  478 +--
 gtk/ui/gtkfontchooserdialog.ui         |    2 -
 gtk/ui/gtkfontchooserwidget.ui         |  530 +--
 gtk/ui/gtkinfobar.ui                   |    2 -
 gtk/ui/gtklockbutton.ui                |    2 -
 gtk/ui/gtkmediacontrols.ui             |   11 +-
 gtk/ui/gtkmessagedialog.ui             |    2 -
 gtk/ui/gtkpagesetupunixdialog.ui       |    7 -
 gtk/ui/gtkpathbar.ui                   |    2 -
 gtk/ui/gtkplacesview.ui                |  232 +-
 gtk/ui/gtkplacesviewrow.ui             |   44 +-
 gtk/ui/gtkprintunixdialog.ui           |   26 +-
 gtk/ui/gtkscalebutton.ui               |    3 -
 gtk/ui/gtksidebarrow.ui                |    3 +-
 gtk/ui/gtkstatusbar.ui                 |    2 -
 gtk/ui/gtktooltipwindow.ui             |    2 -
 gtk/ui/gtkvideo.ui                     |    5 +-
 gtk/ui/gtkvolumebutton.ui              |    2 -
 99 files changed, 4965 insertions(+), 5063 deletions(-)

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.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/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/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/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/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>